From 7ad49f41854321a334818aec8bd418d2dd5f2a22 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 5 Jul 2016 09:32:08 +0200
Subject: [PATCH] Less problematic regexes for MsSQL errors

---
 lib/core/settings.py | 2 +-
 lib/parse/html.py    | 2 ++
 xml/errors.xml       | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 7c35ed59c..eac999f4b 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.7.6"
+VERSION = "1.0.7.7"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
diff --git a/lib/parse/html.py b/lib/parse/html.py
index d5b6c6200..8123b1ee0 100644
--- a/lib/parse/html.py
+++ b/lib/parse/html.py
@@ -42,6 +42,8 @@ class HTMLHandler(ContentHandler):
 
         elif name == "error":
             regexp = attrs.get("regexp")
+            if "SQL" in regexp:
+                print regexp
             if regexp not in kb.cache.regex:
                 keywords = re.findall("\w+", re.sub(r"\\.", " ", regexp))
                 keywords = sorted(keywords, key=len)
diff --git a/xml/errors.xml b/xml/errors.xml
index 9609e3562..2f03d6075 100644
--- a/xml/errors.xml
+++ b/xml/errors.xml
@@ -29,10 +29,10 @@
         <error regexp="OLE DB.* SQL Server"/>
         <error regexp="\bSQL Server[^&lt;&quot;]+Driver"/>
         <error regexp="Warning.*(mssql|sqlsrv)_"/>
-        <error regexp="\bSQL Server.*[0-9a-fA-F]{8}"/>
+        <error regexp="\bSQL Server[^&lt;&quot;]+[0-9a-fA-F]{8}"/>
         <error regexp="(?s)Exception.*\WSystem\.Data\.SqlClient\."/>
         <error regexp="(?s)Exception.*\WRoadhouse\.Cms\."/>
-        <error regexp="Microsoft SQL Native Client.*[0-9a-fA-F]{8}"/>
+        <error regexp="Microsoft SQL Native Client error '[0-9a-fA-F]{8}"/>
         <error regexp="com\.microsoft\.sqlserver\.jdbc\.SQLServerException"/>
         <error regexp="ODBC SQL Server Driver"/>
         <error regexp="SQLServer JDBC Driver"/>