PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-07 05:01:30 +00:00
Code Issues Projects Releases Wiki Activity

Minor update

Browse Source
This commit is contained in:
Miroslav Stampar
2019-04-17 17:35:44 +02:00
parent 1eeb6c1f5b
commit 9459d5ea15
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/core/common.py
View File

@@ -2419,17 +2419,10 @@ def getUnicode(value, encoding=None, noneToNull=False):
except UnicodeDecodeError:
pass
while True:
try:
return six.text_type(value, encoding or (kb.get("pageEncoding") if kb.get("originalPage") else None) or UNICODE_ENCODING)
except UnicodeDecodeError as ex:
try:
return six.text_type(value, UNICODE_ENCODING)
except:
if INVALID_UNICODE_PRIVATE_AREA:
value = value[:ex.start] + "".join(unichr(int('000f00%2x' % ord(_), 16)).encode(UNICODE_ENCODING) for _ in value[ex.start:ex.end]) + value[ex.end:]
else:
value = value[:ex.start] + "".join(INVALID_UNICODE_CHAR_FORMAT % ord(_) for _ in value[ex.start:ex.end]) + value[ex.end:]
try:
return six.text_type(value, encoding or (kb.get("pageEncoding") if kb.get("originalPage") else None) or UNICODE_ENCODING)
except UnicodeDecodeError as ex:
return six.text_type(value, UNICODE_ENCODING, errors="reversible")
elif isListLike(value):
value = list(getUnicode(_, encoding, noneToNull) for _ in value)
return value