fixing few potential problems

This commit is contained in:
Miroslav Stampar 2012-02-29 13:56:40 +00:00
parent c39d85420a
commit d06182347f
3 changed files with 6 additions and 5 deletions

View File

@ -2767,7 +2767,7 @@ def isNoneValue(value):
"""
if isinstance(value, basestring):
return value == "None"
return value in ("None", "")
elif isinstance(value, (list, tuple)):
if len(value) == 1:
return isNoneValue(value[0])

View File

@ -135,9 +135,10 @@ class Enumeration(GenericEnumeration):
_ = (rootQuery.blind.query if query == rootQuery.blind.count else rootQuery.blind.query2 if query == rootQuery.blind.count2 else rootQuery.blind.query3).replace("%s", db) % index
table = inject.getValue(_, inband=False, error=False)
kb.hintValue = table
table = safeSQLIdentificatorNaming(table, True)
tables.append(table)
if not isNoneValue(table):
kb.hintValue = table
table = safeSQLIdentificatorNaming(table, True)
tables.append(table)
if tables:
kb.data.cachedTables[db] = tables

View File

@ -1449,7 +1449,7 @@ class Enumeration:
value = inject.getValue(query, blind=False)
if column == colList[0]:
if isNoneValue(value) or not value:
if isNoneValue(value):
breakRetrieval = True
break
else: