Fixes #2052

stamparm · stamparm · commit 7cca56edfa21 · 2016-07-21T09:38:52.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.37"
+VERSION = "1.0.7.38"
 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
@@ -111,8 +111,13 @@ def _(regex):
                     for column in kb.dumpColumns:
                         base64 = True
                         for child in root:
+                            value = child.attrib.get(column, "").strip()
+                            if value and not re.match(r"\A[a-zA-Z0-9+/]+={0,2}\Z", value):
+                                base64 = False
+                                break
+
                             try:
-                                child.attrib.get(column, "").decode("base64")
+                                value.decode("base64")
                             except binascii.Error:
                                 base64 = False
                                 break
diff --git a/txt/checksum.md5 b/txt/checksum.md5
@@ -45,7 +45,7 @@ e60456db5380840a586654344003d4e6  lib/core/readlineng.py
 5ef56abb8671c2ca6ceecb208258e360  lib/core/replication.py
 99a2b496b9d5b546b335653ca801153f  lib/core/revision.py
 7c15dd2777af4dac2c89cab6df17462e  lib/core/session.py
-749b065d8f4407b77b7b91cbe2a07314  lib/core/settings.py
+97d3d003cad815f9119e4757abd3a70e  lib/core/settings.py
 7af83e4f18cab6dff5e67840eb65be80  lib/core/shell.py
 23657cd7d924e3c6d225719865855827  lib/core/subprocessng.py
 0bc2fae1dec18cdd11954b22358293f2  lib/core/target.py
@@ -99,7 +99,7 @@ cc9c82cfffd8ee9b25ba3af6284f057e  lib/techniques/error/__init__.py
 cc9c82cfffd8ee9b25ba3af6284f057e  lib/techniques/__init__.py
 cc9c82cfffd8ee9b25ba3af6284f057e  lib/techniques/union/__init__.py
 f5d6884cdeed28281187c111d3e49e3b  lib/techniques/union/test.py
-4342d76e9f8d40d8367ae95517aaa4ee  lib/techniques/union/use.py
+395d966e394a11e45be50dfa8f01961b  lib/techniques/union/use.py
 2dfc03a7322c46deb2e5353a7fd4be5e  lib/utils/api.py
 8cdc8c1e663c3b92a756fb7b02cc3c02  lib/utils/crawler.py
 393f8fd1684308213e1d2e6a9d4258c2  lib/utils/deps.py
