mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-02-16 19:40:37 +03:00
some fixes
This commit is contained in:
parent
6b1d5a0ab8
commit
d27afaed7e
|
@ -66,7 +66,7 @@ def tableExists(tableFile, regex=None):
|
||||||
while kb.threadContinue:
|
while kb.threadContinue:
|
||||||
kb.locks.countLock.acquire()
|
kb.locks.countLock.acquire()
|
||||||
if threadData.shared.count < threadData.shared.limit:
|
if threadData.shared.count < threadData.shared.limit:
|
||||||
table = safeSQLIdentificatorNaming(tables[threadData.shared.count])
|
table = safeSQLIdentificatorNaming(tables[threadData.shared.count], True)
|
||||||
threadData.shared.count += 1
|
threadData.shared.count += 1
|
||||||
kb.locks.countLock.release()
|
kb.locks.countLock.release()
|
||||||
else:
|
else:
|
||||||
|
@ -137,7 +137,7 @@ def columnExists(columnFile, regex=None):
|
||||||
table = "%s%s%s" % (conf.db, '..' if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE) else '.', conf.tbl)
|
table = "%s%s%s" % (conf.db, '..' if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE) else '.', conf.tbl)
|
||||||
else:
|
else:
|
||||||
table = conf.tbl
|
table = conf.tbl
|
||||||
table = safeSQLIdentificatorNaming(table)
|
table = safeSQLIdentificatorNaming(table, True)
|
||||||
|
|
||||||
infoMsg = "checking column existence using items from '%s'" % columnFile
|
infoMsg = "checking column existence using items from '%s'" % columnFile
|
||||||
logger.info(infoMsg)
|
logger.info(infoMsg)
|
||||||
|
|
|
@ -299,7 +299,9 @@ class Enumeration(GenericEnumeration):
|
||||||
conf.col = column
|
conf.col = column
|
||||||
|
|
||||||
self.getColumns(onlyColNames=True)
|
self.getColumns(onlyColNames=True)
|
||||||
if kb.data.cachedColumns[db][foundTbl] != {None: None}:
|
|
||||||
|
if db in kb.data.cachedColumns and foundTbl in kb.data.cachedColumns[db]\
|
||||||
|
and not isNoneValue(kb.data.cachedColumns[db][foundTbl]):
|
||||||
dbs[db][foundTbl].update(kb.data.cachedColumns[db][foundTbl])
|
dbs[db][foundTbl].update(kb.data.cachedColumns[db][foundTbl])
|
||||||
kb.data.cachedColumns = {}
|
kb.data.cachedColumns = {}
|
||||||
else:
|
else:
|
||||||
|
@ -355,6 +357,7 @@ class Enumeration(GenericEnumeration):
|
||||||
|
|
||||||
self.getColumns(onlyColNames=True)
|
self.getColumns(onlyColNames=True)
|
||||||
|
|
||||||
|
if db in kb.data.cachedColumns and tbl in kb.data.cachedColumns[db]:
|
||||||
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])
|
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])
|
||||||
kb.data.cachedColumns = {}
|
kb.data.cachedColumns = {}
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -2144,6 +2144,7 @@ class Enumeration:
|
||||||
|
|
||||||
self.getColumns(onlyColNames=True)
|
self.getColumns(onlyColNames=True)
|
||||||
|
|
||||||
|
if foundDb in kb.data.cachedColumns and foundTbl in kb.data.cachedColumns[foundDb]:
|
||||||
dbs[foundDb][foundTbl].update(kb.data.cachedColumns[foundDb][foundTbl])
|
dbs[foundDb][foundTbl].update(kb.data.cachedColumns[foundDb][foundTbl])
|
||||||
kb.data.cachedColumns = {}
|
kb.data.cachedColumns = {}
|
||||||
else:
|
else:
|
||||||
|
@ -2240,6 +2241,7 @@ class Enumeration:
|
||||||
|
|
||||||
self.getColumns(onlyColNames=True)
|
self.getColumns(onlyColNames=True)
|
||||||
|
|
||||||
|
if db in kb.data.cachedColumns and tbl in kb.data.cachedColumns[db]:
|
||||||
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])
|
dbs[db][tbl].update(kb.data.cachedColumns[db][tbl])
|
||||||
kb.data.cachedColumns = {}
|
kb.data.cachedColumns = {}
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user