Minor bug fix

stamparm · stamparm · commit f1dbe9e38873 · 2021-08-18T23:16:19.000+02:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -20,7 +20,7 @@
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.5.8.3"
+VERSION = "1.5.8.4"
 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/plugins/generic/databases.py b/plugins/generic/databases.py
@@ -363,18 +363,20 @@ def getTables(self, bruteForce=None):
                     singleTimeLogMessage(infoMsg)
                     continue
 
-                for query, count in ((rootQuery.blind.query, rootQuery.blind.count), (getattr(rootQuery.blind, "query2", None), getattr(rootQuery.blind, "count2", None))):
-                    if query is None:
+                for _query, _count in ((rootQuery.blind.query, rootQuery.blind.count), (getattr(rootQuery.blind, "query2", None), getattr(rootQuery.blind, "count2", None))):
+                    if _query is None:
                         break
 
                     infoMsg = "fetching number of tables for "
                     infoMsg += "database '%s'" % unsafeSQLIdentificatorNaming(db)
                     logger.info(infoMsg)
 
                     if Backend.getIdentifiedDbms() not in (DBMS.SQLITE, DBMS.FIREBIRD, DBMS.MAXDB, DBMS.ACCESS, DBMS.MCKOI, DBMS.EXTREMEDB):
-                        count = count % unsafeSQLIdentificatorNaming(db)
+                        query = _count % unsafeSQLIdentificatorNaming(db)
+                    else:
+                        query = _count
 
-                    count = inject.getValue(count, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
+                    count = inject.getValue(query, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
 
                     if count == 0:
                         warnMsg = "database '%s' " % unsafeSQLIdentificatorNaming(db)
@@ -395,15 +397,15 @@ def getTables(self, bruteForce=None):
 
                     for index in indexRange:
                         if Backend.isDbms(DBMS.SYBASE):
-                            query = query % (db, (kb.data.cachedTables[-1] if kb.data.cachedTables else " "))
+                            query = _query % (db, (kb.data.cachedTables[-1] if kb.data.cachedTables else " "))
                         elif Backend.getIdentifiedDbms() in (DBMS.MAXDB, DBMS.ACCESS, DBMS.MCKOI, DBMS.EXTREMEDB):
-                            query = query % (kb.data.cachedTables[-1] if kb.data.cachedTables else " ")
+                            query = _query % (kb.data.cachedTables[-1] if kb.data.cachedTables else " ")
                         elif Backend.getIdentifiedDbms() in (DBMS.SQLITE, DBMS.FIREBIRD):
-                            query = query % index
+                            query = _query % index
                         elif Backend.getIdentifiedDbms() in (DBMS.HSQLDB, DBMS.INFORMIX, DBMS.FRONTBASE, DBMS.VIRTUOSO):
-                            query = query % (index, unsafeSQLIdentificatorNaming(db))
+                            query = _query % (index, unsafeSQLIdentificatorNaming(db))
                         else:
-                            query = query % (unsafeSQLIdentificatorNaming(db), index)
+                            query = _query % (unsafeSQLIdentificatorNaming(db), index)
 
                         table = unArrayizeValue(inject.getValue(query, union=False, error=False))
 
