Skip to content

Address CVE-2020-27619 for multibytecodec tests #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wtchappell merged 1 commit into from
Nov 13, 2020
Merged

Address CVE-2020-27619 for multibytecodec tests #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Address CVE-2020-27619 for multibytecodec tests
  • Loading branch information
@ucodery
ucodery committed Nov 10, 2020
commit ec1b4657267074cbe5b7c4a549b0e689bb51281a
23 changes: 8 additions & 15 deletions Lib/test/multibytecodec_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,30 +279,23 @@ def test_mapping_file(self):
self._test_mapping_file_plain()

def _test_mapping_file_plain(self):
_unichr = lambda c: eval("u'\\U%08x'" % int(c, 16))
unichrs = lambda s: u''.join(_unichr(c) for c in s.split('+'))
def unichrs(s):
return ''.join(unichr(int(x, 16)) for x in s.split('+'))

urt_wa = {}

with self.open_mapping_file() as f:
for line in f:
if not line:
break
data = line.split('#')[0].strip().split()
data = line.split('#')[0].split()
if len(data) != 2:
continue

csetval = eval(data[0])
if csetval <= 0x7F:
csetch = chr(csetval & 0xff)
elif csetval >= 0x1000000:
csetch = chr(csetval >> 24) + chr((csetval >> 16) & 0xff) + \
chr((csetval >> 8) & 0xff) + chr(csetval & 0xff)
elif csetval >= 0x10000:
csetch = chr(csetval >> 16) + \
chr((csetval >> 8) & 0xff) + chr(csetval & 0xff)
elif csetval >= 0x100:
csetch = chr(csetval >> 8) + chr(csetval & 0xff)
else:
if len(data[0]) < 3 or data[0][:2] != '0x':
self.fail("Invalid line: {line!r}".format(line=line))
csetch = data[0][2:].decode('hex')
if 0x80 <= ord(csetch[0]):
continue

unich = unichrs(data[1])
Expand Down