traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-41944: No longer call eval() on content received via HTTP in the CJK codec tests (GH-22566)

This commit is contained in:
Serhiy Storchaka 2020-10-06 15:14:51 +03:00 committed by GitHub
parent 91e3339066
commit 2ef5caa58f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lib/test/multibytecodec_support.py
View File

@ -305,29 +305,23 @@ class TestBase_Mapping(unittest.TestCase):
self._test_mapping_file_plain() self._test_mapping_file_plain()
def _test_mapping_file_plain(self): def _test_mapping_file_plain(self):
unichrs = lambda s: ''.join(map(chr, map(eval, s.split('+')))) def unichrs(s):
return ''.join(chr(int(x, 16)) for x in s.split('+'))
urt_wa = {} urt_wa = {}
with self.open_mapping_file() as f: with self.open_mapping_file() as f:
for line in f: for line in f:
if not line: if not line:
break break
data = line.split('#')[0].strip().split() data = line.split('#')[0].split()
if len(data) != 2: if len(data) != 2:
continue continue
csetval = eval(data[0]) if data[0][:2] != '0x':
if csetval <= 0x7F: self.fail(f"Invalid line: {line!r}")
csetch = bytes([csetval & 0xff]) csetch = bytes.fromhex(data[0][2:])
elif csetval >= 0x1000000: if len(csetch) == 1 and 0x80 <= csetch[0]:
csetch = bytes([(csetval >> 24), ((csetval >> 16) & 0xff),
((csetval >> 8) & 0xff), (csetval & 0xff)])
elif csetval >= 0x10000:
csetch = bytes([(csetval >> 16), ((csetval >> 8) & 0xff),
(csetval & 0xff)])
elif csetval >= 0x100:
csetch = bytes([(csetval >> 8), (csetval & 0xff)])
else:
continue continue
unich = unichrs(data[1]) unich = unichrs(data[1])

1
Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst Normal file
View File

@ -0,0 +1 @@
Tests for CJK codecs no longer call ``eval()`` on content received via HTTP.