sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 17:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor patch (previous combination is not working well with oriental characters - 0 length normalized unicode string is being returned)

Browse Source
This commit is contained in:
stamparm 2013-03-28 15:37:14 +01:00
parent e1ffdde532
commit a371f182ac
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/core/dump.py
View File

@ -212,7 +212,7 @@ class Dump(object):
if table and isListLike(table): if table and isListLike(table):
table = table[0] table = table[0]
maxlength = max(maxlength, len(unsafeSQLIdentificatorNaming(normalizeUnicode(table) or str(table)))) maxlength = max(maxlength, len(unsafeSQLIdentificatorNaming(normalizeUnicode(table) or unicode(table))))
lines = "-" * (int(maxlength) + 2) lines = "-" * (int(maxlength) + 2)
@ -233,7 +233,7 @@ class Dump(object):
table = table[0] table = table[0]
table = unsafeSQLIdentificatorNaming(table) table = unsafeSQLIdentificatorNaming(table)
blank = " " * (maxlength - len(normalizeUnicode(table) or str(table))) blank = " " * (maxlength - len(normalizeUnicode(table) or unicode(table)))
self._write("| %s%s |" % (table, blank)) self._write("| %s%s |" % (table, blank))
self._write("+%s+\n" % lines) self._write("+%s+\n" % lines)
@ -328,7 +328,7 @@ class Dump(object):
for ctables in dbTables.values(): for ctables in dbTables.values():
for tables in ctables.values(): for tables in ctables.values():
for table in tables: for table in tables:
maxlength1 = max(maxlength1, len(normalizeUnicode(table) or str(table))) maxlength1 = max(maxlength1, len(normalizeUnicode(table) or unicode(table)))
for db, counts in dbTables.items(): for db, counts in dbTables.items():
self._write("Database: %s" % unsafeSQLIdentificatorNaming(db) if db else "Current database") self._write("Database: %s" % unsafeSQLIdentificatorNaming(db) if db else "Current database")
@ -354,7 +354,7 @@ class Dump(object):
tables.sort(key=lambda x: x.lower() if isinstance(x, basestring) else x) tables.sort(key=lambda x: x.lower() if isinstance(x, basestring) else x)
for table in tables: for table in tables:
blank1 = " " * (maxlength1 - len(normalizeUnicode(table) or str(table))) blank1 = " " * (maxlength1 - len(normalizeUnicode(table) or unicode(table)))
blank2 = " " * (maxlength2 - len(str(count))) blank2 = " " * (maxlength2 - len(str(count)))
self._write("| %s%s | %d%s |" % (table, blank1, count, blank2)) self._write("| %s%s | %d%s |" % (table, blank1, count, blank2))