diff --git a/lib/core/settings.py b/lib/core/settings.py index bb059413e..fc06e33bb 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 (...) -VERSION = "1.0.7.35" +VERSION = "1.0.7.36" 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 index 975b88c96..fa8e39f09 100644 --- a/lib/techniques/union/use.py +++ b/lib/techniques/union/use.py @@ -51,6 +51,7 @@ from lib.core.settings import MAX_BUFFERED_PARTIAL_UNION_LENGTH from lib.core.settings import NULL from lib.core.settings import SQL_SCALAR_REGEX from lib.core.settings import TURN_OFF_RESUME_INFO_LIMIT +from lib.core.settings import UNICODE_ENCODING from lib.core.threads import getCurrentThreadData from lib.core.threads import runThreads from lib.core.unescaper import unescaper @@ -105,7 +106,7 @@ def _oneShotUnionUse(expression, unpack=True, limited=False): output = extractRegexResult(r"(?P()+)", page) if output: try: - root = xml.etree.ElementTree.fromstring("%s" % output) + root = xml.etree.ElementTree.fromstring("%s" % output.encode(UNICODE_ENCODING)) retVal = "" for column in kb.dumpColumns: base64 = True @@ -128,6 +129,8 @@ def _oneShotUnionUse(expression, unpack=True, limited=False): except xml.etree.ElementTree.ParseError: pass + else: + retVal = getUnicode(retVal) if retVal is not None: retVal = getUnicode(retVal, kb.pageEncoding) diff --git a/txt/checksum.md5 b/txt/checksum.md5 index b88a92e87..69ae87c7e 100644 --- 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 -02b122c6229e1c4b6ab42575b5200783 lib/core/settings.py +8f00825e5fa85985910b681359845e6e 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 -d28a3e7ba152504a56be957a10faa1af lib/techniques/union/use.py +4342d76e9f8d40d8367ae95517aaa4ee lib/techniques/union/use.py 2dfc03a7322c46deb2e5353a7fd4be5e lib/utils/api.py 8cdc8c1e663c3b92a756fb7b02cc3c02 lib/utils/crawler.py 393f8fd1684308213e1d2e6a9d4258c2 lib/utils/deps.py