Fix for a privately reported bug

This commit is contained in:
Miroslav Stampar 2016-10-08 21:11:43 +02:00
parent e4b0ac9ae5
commit b51b80b174
3 changed files with 25 additions and 21 deletions

View File

@ -20,7 +20,7 @@ from lib.core.enums import OS
from lib.core.revision import getRevisionNumber from lib.core.revision import getRevisionNumber
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.0.10.19" VERSION = "1.0.10.20"
REVISION = getRevisionNumber() REVISION = getRevisionNumber()
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}

View File

@ -512,25 +512,29 @@ class Tag(PageElement):
entities with the appropriate Unicode characters. If HTML entities with the appropriate Unicode characters. If HTML
entities are being converted, any unrecognized entities are entities are being converted, any unrecognized entities are
escaped.""" escaped."""
x = match.group(1) try:
if self.convertHTMLEntities and x in name2codepoint: x = match.group(1)
return unichr(name2codepoint[x]) if self.convertHTMLEntities and x in name2codepoint:
elif x in self.XML_ENTITIES_TO_SPECIAL_CHARS: return unichr(name2codepoint[x])
if self.convertXMLEntities: elif x in self.XML_ENTITIES_TO_SPECIAL_CHARS:
return self.XML_ENTITIES_TO_SPECIAL_CHARS[x] if self.convertXMLEntities:
else: return self.XML_ENTITIES_TO_SPECIAL_CHARS[x]
return u'&%s;' % x else:
elif len(x) > 0 and x[0] == '#': return u'&%s;' % x
# Handle numeric entities elif len(x) > 0 and x[0] == '#':
if len(x) > 1 and x[1] == 'x': # Handle numeric entities
return unichr(int(x[2:], 16)) if len(x) > 1 and x[1] == 'x':
else: return unichr(int(x[2:], 16))
return unichr(int(x[1:])) else:
return unichr(int(x[1:]))
elif self.escapeUnrecognizedEntities: elif self.escapeUnrecognizedEntities:
return u'&amp;%s;' % x return u'&amp;%s;' % x
else:
return u'&%s;' % x except ValueError: # e.g. ValueError: unichr() arg not in range(0x10000)
pass
return u'&%s;' % x
def __init__(self, parser, name, attrs=None, parent=None, def __init__(self, parser, name, attrs=None, parent=None,
previous=None): previous=None):

View File

@ -45,7 +45,7 @@ e60456db5380840a586654344003d4e6 lib/core/readlineng.py
5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py 5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py
99a2b496b9d5b546b335653ca801153f lib/core/revision.py 99a2b496b9d5b546b335653ca801153f lib/core/revision.py
7c15dd2777af4dac2c89cab6df17462e lib/core/session.py 7c15dd2777af4dac2c89cab6df17462e lib/core/session.py
77760b7e2abbd21cf6b95234d698078b lib/core/settings.py 2198a75694fe7bff1fe9dd0391f27358 lib/core/settings.py
7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py 7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py
23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py 23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py
c3ace7874a536d801f308cf1fd03df99 lib/core/target.py c3ace7874a536d801f308cf1fd03df99 lib/core/target.py
@ -276,7 +276,7 @@ a5f02f75856551499c0bf33672869a7f tamper/versionedkeywords.py
99a90d668f367f5660698c00e84ec671 tamper/xforwardedfor.py 99a90d668f367f5660698c00e84ec671 tamper/xforwardedfor.py
368165b45dadcdff4422bc010700832a thirdparty/ansistrm/ansistrm.py 368165b45dadcdff4422bc010700832a thirdparty/ansistrm/ansistrm.py
d41d8cd98f00b204e9800998ecf8427e thirdparty/ansistrm/__init__.py d41d8cd98f00b204e9800998ecf8427e thirdparty/ansistrm/__init__.py
a53a7a876b401aaaa3535376676692ae thirdparty/beautifulsoup/beautifulsoup.py 8e775c25bc9e84891ad6fcb4f0005c23 thirdparty/beautifulsoup/beautifulsoup.py
cb2e1fe7c404dff41a2ae9132828f532 thirdparty/beautifulsoup/__init__.py cb2e1fe7c404dff41a2ae9132828f532 thirdparty/beautifulsoup/__init__.py
ff54a1d98f0ab01ba7b58b068d2ebd26 thirdparty/bottle/bottle.py ff54a1d98f0ab01ba7b58b068d2ebd26 thirdparty/bottle/bottle.py
4528e6a7bb9341c36c425faf40ef32c3 thirdparty/bottle/__init__.py 4528e6a7bb9341c36c425faf40ef32c3 thirdparty/bottle/__init__.py