Bug fix (less queries to make - patching the patch 3544793)

stamparm · stamparm · commit 2647ac9abb74 · 2019-03-08T15:49:56.000+01:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -19,7 +19,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.3.12"
+VERSION = "1.3.3.13"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
diff --git a/lib/techniques/union/test.py b/lib/techniques/union/test.py
@@ -303,9 +303,9 @@ def _unionTestByCharBruteforce(comment, place, parameter, value, prefix, suffix)
             if not all((validPayload, vector)) and not warnMsg.endswith("consider "):
                 singleTimeWarnMessage(warnMsg)
 
-    if count and orderBy is None and kb.orderByColumns is not None:  # discard ORDER BY results (not usable - e.g. maybe invalid altogether)
-        conf.uChar, kb.uChar = uChars
-        validPayload, vector = _unionTestByCharBruteforce(comment, place, parameter, value, prefix, suffix)
+        if orderBy is None and kb.orderByColumns is not None and not all((validPayload, vector)):  # discard ORDER BY results (not usable - e.g. maybe invalid altogether)
+            conf.uChar, kb.uChar = uChars
+            validPayload, vector = _unionTestByCharBruteforce(comment, place, parameter, value, prefix, suffix)
 
     return validPayload, vector
 
diff --git a/txt/checksum.md5 b/txt/checksum.md5
@@ -50,7 +50,7 @@ d5ef43fe3cdd6c2602d7db45651f9ceb  lib/core/readlineng.py
 7d8a22c582ad201f65b73225e4456170  lib/core/replication.py
 3179d34f371e0295dd4604568fb30bcd  lib/core/revision.py
 d6269c55789f78cf707e09a0f5b45443  lib/core/session.py
-011dfdf53d887c215e533be10a7bd69a  lib/core/settings.py
+b4db7c3967f8c8daa5f32f1c5efd8b1b  lib/core/settings.py
 4483b4a5b601d8f1c4281071dff21ecc  lib/core/shell.py
 10fd19b0716ed261e6d04f311f6f527c  lib/core/subprocessng.py
 0a5b0a97a36c19022665f66858fd7450  lib/core/target.py
@@ -100,7 +100,7 @@ fb6be55d21a70765e35549af2484f762  lib/techniques/error/__init__.py
 7b58029a51b9bf989d18e5bb6e99635c  lib/techniques/error/use.py
 fb6be55d21a70765e35549af2484f762  lib/techniques/__init__.py
 fb6be55d21a70765e35549af2484f762  lib/techniques/union/__init__.py
-9d9a6148f10693aaab5fac1273d981d4  lib/techniques/union/test.py
+54d077ef49056031fe746bcc53b1f081  lib/techniques/union/test.py
 e141fb96f2a136bafd6bb2350f02d33b  lib/techniques/union/use.py
 8e9ddc7220f6beda89cc45c65e51e72b  lib/utils/api.py
 544dee96e782560fe4355cbf6ee19b8c  lib/utils/brute.py
