Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cc9711e

Browse files
stamparmstamparm
committed
Couple of drei updates
1 parent c3f15ef commit cc9711e

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎lib/core/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from thirdparty import six
1919

2020
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
21-
VERSION = "1.3.5.91"
21+
VERSION = "1.3.5.92"
2222
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2323
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2424
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

‎lib/techniques/union/use.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ def unionThread():
352352
key = re.sub(r"[^A-Za-z0-9]", "", item).lower()
353353
if key not in filtered or re.search(r"[^A-Za-z0-9]", item):
354354
filtered[key] = item
355-
items = list(filtered.values())
355+
items = list(six.itervalues(filtered))
356356
items = [items]
357357
index = None
358358
for index in xrange(1 + len(threadData.shared.buffered)):

‎plugins/dbms/maxdb/enumeration.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def getDbs(self):
4949
retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.schemaname' % kb.aliasName], blind=True)
5050

5151
if retVal:
52-
kb.data.cachedDbs = list(retVal[0].values())[0]
52+
kb.data.cachedDbs = six.itervalues(retVal[0]).next()
5353

5454
if kb.data.cachedDbs:
5555
kb.data.cachedDbs.sort()
@@ -134,7 +134,7 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
134134
if len(kb.data.cachedTables) > 0:
135135
tblList = list(kb.data.cachedTables.values())
136136

137-
if isListLike(tblList[0]):
137+
if tblList and isListLike(tblList[0]):
138138
tblList = tblList[0]
139139
else:
140140
errMsg = "unable to retrieve the tables "

‎plugins/dbms/sybase/enumeration.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def getDbs(self):
103103
retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.name' % kb.aliasName], blind=blind, alias=kb.aliasName)
104104

105105
if retVal:
106-
kb.data.cachedDbs = list(retVal[0].values())[0]
106+
kb.data.cachedDbs = six.itervalues(retVal[0]).next()
107107
break
108108

109109
if kb.data.cachedDbs:
@@ -147,7 +147,7 @@ def getTables(self, bruteForce=None):
147147
retVal = pivotDumpTable("(%s) AS %s" % (query, kb.aliasName), ['%s.name' % kb.aliasName], blind=blind, alias=kb.aliasName)
148148

149149
if retVal:
150-
for table in list(retVal[0].values())[0]:
150+
for table in six.itervalues(retVal[0]).next():
151151
if db not in kb.data.cachedTables:
152152
kb.data.cachedTables[db] = [table]
153153
else:
@@ -196,9 +196,9 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
196196
self.getTables()
197197

198198
if len(kb.data.cachedTables) > 0:
199-
tblList = list(kb.data.cachedTables.values())
199+
tblList = list(six.itervalues(kb.data.cachedTables))
200200

201-
if isListLike(tblList[0]):
201+
if tblList and isListLike(tblList[0]):
202202
tblList = tblList[0]
203203
else:
204204
errMsg = "unable to retrieve the tables "

‎plugins/generic/databases.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,9 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
478478
if conf.db in kb.data.cachedTables:
479479
tblList = kb.data.cachedTables[conf.db]
480480
else:
481-
tblList = list(kb.data.cachedTables.values())
481+
tblList = list(six.itervalues(kb.data.cachedTables))
482482

483-
if isListLike(tblList[0]):
483+
if tblList and isListLike(tblList[0]):
484484
tblList = tblList[0]
485485

486486
tblList = list(tblList)

‎plugins/generic/entries.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ def dumpTable(self, foundData=None):
9393
self.getTables()
9494

9595
if len(kb.data.cachedTables) > 0:
96-
tblList = list(kb.data.cachedTables.values())
96+
tblList = list(six.itervalues(kb.data.cachedTables))
9797

98-
if isListLike(tblList[0]):
98+
if tblList and isListLike(tblList[0]):
9999
tblList = tblList[0]
100100
elif not conf.search:
101101
errMsg = "unable to retrieve the tables "

0 commit comments

Comments
 (0)