Minor improvement

Author: stamparm

data/txt/sha256sums.txt

@@ -188,12 +188,12 @@ c1cb56f2a43e9f2f6b25d5f3d504e856ea21df6fc14af5e37b1000feef2bdb5a  lib/core/optio
 48797d6c34dd9bb8a53f7f3794c85f4288d82a9a1d6be7fcf317d388cb20d4b3  lib/core/replication.py
 0b8c38a01bb01f843d94a6c5f2075ee47520d0c4aa799cecea9c3e2c5a4a23a6  lib/core/revision.py
 888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c  lib/core/session.py
-e2e711274bf226e785203353f9dd205e8fd3b9b11f9470513df38178edf288b6  lib/core/settings.py
+cacbf90118ef472f154474891da53f6fd2641c98421902134ba1706f9bc1c716  lib/core/settings.py
 cd5a66deee8963ba8e7e9af3dd36eb5e8127d4d68698811c29e789655f507f82  lib/core/shell.py
 bcb5d8090d5e3e0ef2a586ba09ba80eef0c6d51feb0f611ed25299fbb254f725  lib/core/subprocessng.py
 d35650179816193164a5f177102f18379dfbe6bb6d40fbb67b78d907b41c8038  lib/core/target.py
 ddf8c5a3dbebd6cdf8b8ba4417e36652d1e040f025175cb6487f1aebc0208836  lib/core/testing.py
-cf4dca323645d623109a82277a8e8a63eb9abb3fff6c8a57095eb171c1ef91b3  lib/core/threads.py
+2ac067fd7a8d6fedbc75f0ac2e5ee1533c63009bf257e88fdd71d8d71d4c8e5a  lib/core/threads.py
 b9aacb840310173202f79c2ba125b0243003ee6b44c92eca50424f2bdfc83c02  lib/core/unescaper.py
 10719f5ca450610ad28242017b2d8a77354ca357ffa26948c5f62d20cac29a8b  lib/core/update.py
 ec11fd5a3f4efd10a1cae288157ac6eb6fb75da4666d76d19f6adf74ac338b5a  lib/core/wordlist.py

lib/core/settings.py

@@ -19,7 +19,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.1.73"
+VERSION = "1.10.1.74"
 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/core/threads.py

@@ -188,13 +188,15 @@ def _threadFunction():
             threads.append(thread)
 
         # And wait for them to all finish
-        alive = True
-        while alive:
+        while True:
             alive = False
             for thread in threads:
-                if thread.is_alive():
+                if thread.isAlive():
                     alive = True
-                    time.sleep(0.1)
+                    break
+            if not alive:
+                break
+            time.sleep(0.1)
 
     except (KeyboardInterrupt, SqlmapUserQuitException) as ex:
         print()
@@ -211,8 +213,8 @@ def _threadFunction():
         if numThreads > 1:
             logger.info("waiting for threads to finish%s" % (" (Ctrl+C was pressed)" if isinstance(ex, KeyboardInterrupt) else ""))
         try:
-            while (threading.active_count() > 1):
-                pass
+            while threading.active_count() > 1:
+                time.sleep(0.1)
 
         except KeyboardInterrupt:
             kb.multipleCtrlC = True