Major silent bug fix to multi-threading functionality. Thanks Nico Leidecker for reporting!

bdamele · bdamele · commit 13de8366d0da · 2009-05-20T09:34:13.000Z
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -140,38 +140,34 @@ def etaProgressUpdate(charTime, index):
 
 
         def downloadThread():
-            while True:
-                idxlock.acquire()
-
-                if index[0] >= length:
-                    idxlock.release()
-
-                    return
+            try:
+                while True:
+                    idxlock.acquire()
 
-                index[0] += 1
-                curidx = index[0]
-                idxlock.release()
+                    if index[0] >= length:
+                        idxlock.release()
 
-                charStart = time.time()
-                val       = getChar(curidx)
+                        return
 
-                if val == None:
-                    raise sqlmapValueException, "failed to get character at index %d (expected %d total)" % (curidx, length)
+                    index[0] += 1
+                    curidx = index[0]
+                    idxlock.release()
 
-                value[curidx-1] = val
+                    charStart = time.time()
+                    val       = getChar(curidx)
 
-                if showEta:
-                    etaProgressUpdate(time.time() - charStart, index[0])
-                elif conf.verbose in ( 1, 2 ):
-                    s = "".join([c or "_" for c in value])
-                    iolock.acquire()
-                    dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), s))
-                    iolock.release()
+                    if val == None:
+                        raise sqlmapValueException, "failed to get character at index %d (expected %d total)" % (curidx, length)
 
+                    value[curidx-1] = val
 
-        def downloadThreadProxy(numThread):
-            try:
-                downloadThread()
+                    if showEta:
+                        etaProgressUpdate(time.time() - charStart, index[0])
+                    elif conf.verbose in ( 1, 2 ):
+                        s = "".join([c or "_" for c in value])
+                        iolock.acquire()
+                        dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), s))
+                        iolock.release()
 
             except (sqlmapConnectionException, sqlmapValueException), errMsg:
                 conf.threadException = True
@@ -199,7 +195,7 @@ def downloadThreadProxy(numThread):
 
         # Start the threads
         for numThread in range(numThreads):
-            thread = threading.Thread(target=downloadThreadProxy(numThread))
+            thread = threading.Thread(target=downloadThread)
             thread.start()
             threads.append(thread)
 
