Minor performance patch

Author: stamparm

data/txt/sha256sums.txt

@@ -188,7 +188,7 @@ c03dc585f89642cfd81b087ac2723e3e1bb3bfa8c60e6f5fe58ef3b0113ebfe6  lib/core/data.
 48797d6c34dd9bb8a53f7f3794c85f4288d82a9a1d6be7fcf317d388cb20d4b3  lib/core/replication.py
 0b8c38a01bb01f843d94a6c5f2075ee47520d0c4aa799cecea9c3e2c5a4a23a6  lib/core/revision.py
 888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c  lib/core/session.py
-d69a1586a6aae582afe790ecde487acd7e15aec192d687788ef532974051fe0b  lib/core/settings.py
+872dd556f0197b8f51f62260cbf92a4bbf8f5f40f6f3af98df78e9a790f79a77  lib/core/settings.py
 cd5a66deee8963ba8e7e9af3dd36eb5e8127d4d68698811c29e789655f507f82  lib/core/shell.py
 bcb5d8090d5e3e0ef2a586ba09ba80eef0c6d51feb0f611ed25299fbb254f725  lib/core/subprocessng.py
 70ea3768f1b3062b22d20644df41c86238157ec80dd43da40545c620714273c6  lib/core/target.py
@@ -230,7 +230,7 @@ f522436fbd14bdab090a1d305fcac0361800cb8e36c8cbcb47933298376a71e0  lib/takeover/r
 f6e5d6e2ff368fa39943b2302982f33c47eb9a12d01419bef50fcf934b2bce34  lib/takeover/udf.py
 23d73af417604dab460b74cdc230896153f018a6c00d144019491053640a172f  lib/takeover/web.py
 8cc1e226d4150fe8aa1a056e5d32d858ed6444d3d4e2af7fb4bc08f0bbe9d527  lib/takeover/xp_cmdshell.py
-69928272eed889033e106527f88454dc844bfbb375fcf7c22d5f76ee30c62c9b  lib/techniques/blind/inference.py
+3609556c6c72010ce4cae5ffeeb74437a15a9dc218f77e079655f32e704fdeef  lib/techniques/blind/inference.py
 1966ca704961fb987ab757f0a4afddbf841d1a880631b701487c75cef63d60c3  lib/techniques/blind/__init__.py
 1966ca704961fb987ab757f0a4afddbf841d1a880631b701487c75cef63d60c3  lib/techniques/dns/__init__.py
 3df9839fb92a81d46b6194d7adacb43f391efb78b071783c132e8d596ecbfaf1  lib/techniques/dns/test.py

lib/core/settings.py

@@ -20,7 +20,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.6.62"
+VERSION = "1.10.6.63"
 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)

lib/techniques/blind/inference.py

@@ -512,6 +512,8 @@ def getChar(idx, charTbl=None, continuousOrder=True, expand=charsetType is None,
             threadData.shared.value = [None] * length
             threadData.shared.index = [firstChar]    # As list for python nested function scoping
             threadData.shared.start = firstChar
+            threadData.shared.retrieved = 0
+            threadData.shared.endIndex = 0
 
             try:
                 def blindThread():
@@ -537,33 +539,30 @@ def blindThread():
                             break
 
                         with kb.locks.value:
-                            threadData.shared.value[currentCharIndex - 1 - firstChar] = val
+                            idx = currentCharIndex - 1 - firstChar
+                            threadData.shared.value[idx] = val
+                            threadData.shared.retrieved += 1
+                            if idx > threadData.shared.endIndex:
+                                threadData.shared.endIndex = idx
                             currentValue = list(threadData.shared.value)
 
                         if kb.threadContinue:
                             if showEta:
                                 progress.progress(threadData.shared.index[0])
                             elif conf.verbose >= 1:
                                 startCharIndex = 0
-                                endCharIndex = 0
-
-                                for i in xrange(length):
-                                    if currentValue[i] is not None:
-                                        endCharIndex = max(endCharIndex, i)
+                                endCharIndex = threadData.shared.endIndex
 
                                 output = ''
 
                                 if endCharIndex > conf.progressWidth:
                                     startCharIndex = endCharIndex - conf.progressWidth
 
-                                count = threadData.shared.start
+                                count = threadData.shared.start + threadData.shared.retrieved
 
                                 for i in xrange(startCharIndex, endCharIndex + 1):
                                     output += '_' if currentValue[i] is None else filterControlChars(currentValue[i] if len(currentValue[i]) == 1 else ' ', replacement=' ')
 
-                                for i in xrange(length):
-                                    count += 1 if currentValue[i] is not None else 0
-
                                 if startCharIndex > 0:
                                     output = ".." + output[2:]