Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bpo-41944: No longer call eval() on content received via HTTP in the …
…CJK codec tests (GH-22566) (GH-22579)

(cherry picked from commit 2ef5caa)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
  • Loading branch information
miss-islington and serhiy-storchaka committed Oct 20, 2020
1 parent a158fb9 commit e912e94
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
22 changes: 8 additions & 14 deletions Lib/test/multibytecodec_support.py
Expand Up @@ -300,29 +300,23 @@ def test_mapping_file(self):
self._test_mapping_file_plain()

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 = {}

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 = bytes([csetval & 0xff])
elif csetval >= 0x1000000:
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:
if data[0][:2] != '0x':
self.fail(f"Invalid line: {line!r}")
csetch = bytes.fromhex(data[0][2:])
if len(csetch) == 1 and 0x80 <= csetch[0]:
continue

unich = unichrs(data[1])
Expand Down
@@ -0,0 +1 @@
Tests for CJK codecs no longer call ``eval()`` on content received via HTTP.

0 comments on commit e912e94

Please sign in to comment.