mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-92536: Update unicode struct size to ensure MemoryError is raised (GH-92867)

Browse source
This commit is contained in:
Dennis Sweeney 2022-05-17 10:12:21 -04:00 • committed by GitHub
parent 8781a041a0
commit 19a4252459
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_unicode.py
View file

@ -2370,14 +2370,9 @@ class UnicodeTest(string_tests.CommonTest,
self.assertIs(s.expandtabs(), s) self.assertIs(s.expandtabs(), s)
def test_raiseMemError(self): def test_raiseMemError(self):
if struct.calcsize('P') == 8: null_byte = 1
# 64 bits pointers ascii_struct_size = sys.getsizeof("a") - len("a") - null_byte
ascii_struct_size = 48 compact_struct_size = sys.getsizeof("\xff") - len("\xff") - null_byte
compact_struct_size = 72
else:
# 32 bits pointers
ascii_struct_size = 24
compact_struct_size = 36
for char in ('a', '\xe9', '\u20ac', '\U0010ffff'): for char in ('a', '\xe9', '\u20ac', '\U0010ffff'):
code = ord(char) code = ord(char)
@ -2395,6 +2390,7 @@ class UnicodeTest(string_tests.CommonTest,
# be allocatable, given enough memory. # be allocatable, given enough memory.
maxlen = ((sys.maxsize - struct_size) // char_size) maxlen = ((sys.maxsize - struct_size) // char_size)
alloc = lambda: char * maxlen alloc = lambda: char * maxlen
with self.subTest(char=char):
self.assertRaises(MemoryError, alloc) self.assertRaises(MemoryError, alloc)
self.assertRaises(MemoryError, alloc) self.assertRaises(MemoryError, alloc)