This commit is contained in:
Miroslav Stampar 2019-05-09 13:14:42 +02:00
parent 9c917ec920
commit 3bf89fed6e
3 changed files with 8 additions and 1 deletions

View File

@ -3322,6 +3322,10 @@ def unArrayizeValue(value):
'1' '1'
>>> unArrayizeValue(['1', '2']) >>> unArrayizeValue(['1', '2'])
'1' '1'
>>> unArrayizeValue([['a', 'b'], 'c'])
'a'
>>> unArrayizeValue(_ for _ in xrange(10))
0
""" """
if isListLike(value): if isListLike(value):
@ -3332,6 +3336,8 @@ def unArrayizeValue(value):
else: else:
value = [_ for _ in flattenValue(value) if _ is not None] value = [_ for _ in flattenValue(value) if _ is not None]
value = value[0] if len(value) > 0 else None value = value[0] if len(value) > 0 else None
elif inspect.isgenerator(value):
value = unArrayizeValue([_ for _ in value])
return value return value

View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty import six from thirdparty import six
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.5.64" VERSION = "1.3.5.65"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} 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) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

View File

@ -637,6 +637,7 @@ class Databases:
for columnData in values: for columnData in values:
if not isNoneValue(columnData): if not isNoneValue(columnData):
columnData = [unArrayizeValue(_) for _ in columnData]
name = safeSQLIdentificatorNaming(columnData[0]) name = safeSQLIdentificatorNaming(columnData[0])
if name: if name: