Fixes #2026

stamparm · stamparm · commit 1e6191e3b1c1 · 2016-07-16T15:51:09.000+02:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -19,7 +19,7 @@
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.7.25"
+VERSION = "1.0.7.26"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py
@@ -102,28 +102,32 @@ def _(regex):
 
             retVal = _("(?P<result>%s.*%s)" % (kb.chars.start, kb.chars.stop))
         else:
-            output = extractRegexResult(r"(?P<result>(<row[^>]+>)+)", page)
+            output = extractRegexResult(r"(?P<result>(<row.+?/>)+)", page)
             if output:
-                retVal = ""
-                root = xml.etree.ElementTree.fromstring("<root>%s</root>" % output)
-                for column in kb.dumpColumns:
-                    base64 = True
-                    for child in root:
-                        try:
-                            child.attrib.get(column, "").decode("base64")
-                        except binascii.Error:
-                            base64 = False
-                            break
-
-                    if base64:
+                try:
+                    root = xml.etree.ElementTree.fromstring("<root>%s</root>" % output)
+                    retVal = ""
+                    for column in kb.dumpColumns:
+                        base64 = True
                         for child in root:
-                            child.attrib[column] = child.attrib.get(column, "").decode("base64") or NULL
+                            try:
+                                child.attrib.get(column, "").decode("base64")
+                            except binascii.Error:
+                                base64 = False
+                                break
 
-                for child in root:
-                    row = []
-                    for column in kb.dumpColumns:
-                        row.append(child.attrib.get(column, NULL))
-                    retVal += "%s%s%s" % (kb.chars.start, kb.chars.delimiter.join(row), kb.chars.stop)
+                        if base64:
+                            for child in root:
+                                child.attrib[column] = child.attrib.get(column, "").decode("base64") or NULL
+
+                    for child in root:
+                        row = []
+                        for column in kb.dumpColumns:
+                            row.append(child.attrib.get(column, NULL))
+                        retVal += "%s%s%s" % (kb.chars.start, kb.chars.delimiter.join(row), kb.chars.stop)
+
+                except xml.etree.ElementTree.ParseError:
+                    pass
 
         if retVal is not None:
             retVal = getUnicode(retVal, kb.pageEncoding)
