Skip to content

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

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
serhiy-storchaka merged 2 commits into from
Oct 6, 2020
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0e3761
bpo-41944: No longer call eval() on content received via HTTP in the …
serhiy-storchaka Oct 5, 2020
2fdfdc1
Convert assert to fail().
serhiy-storchaka Oct 6, 2020
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
21 changes: 7 additions & 14 deletions Lib/test/multibytecodec_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,29 +305,22 @@ 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:
assert data[0][:2] == '0x'
Copy link
Copy Markdown
Member

@vstinner vstinner Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest something like:

if not data[0].startswith('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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Tests/2020-10-05-17-43-46.bpo-41944.rf1dYb.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Tests for CJK codecs no longer call ``eval()`` on content received via HTTP.