Skip to content

gh-92536: Compute unicode struct sizes to ensure MemError is raised #92867

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
sweeneyde merged 1 commit into from
May 17, 2022
Merged

gh-92536: Compute unicode struct sizes to ensure MemError is raised #92867

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
Update unicode struct size to ensure MemError is raised
  • Loading branch information
@sweeneyde
sweeneyde committed May 17, 2022
commit 111ece3a520d80c97fc5a20e489152e822a5bc90
16 changes: 6 additions & 10 deletions Lib/test/test_unicode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2370,14 +2370,9 @@ def test_expandtabs_optimization(self):
self.assertIs(s.expandtabs(), s)

def test_raiseMemError(self):
if struct.calcsize('P') == 8:
# 64 bits pointers
ascii_struct_size = 48
compact_struct_size = 72
else:
# 32 bits pointers
ascii_struct_size = 24
compact_struct_size = 36
null_byte = 1
ascii_struct_size = sys.getsizeof("a") - len("a") - null_byte
compact_struct_size = sys.getsizeof("\xff") - len("\xff") - null_byte

for char in ('a', '\xe9', '\u20ac', '\U0010ffff'):
code = ord(char)
Expand All @@ -2395,8 +2390,9 @@ def test_raiseMemError(self):
# be allocatable, given enough memory.
maxlen = ((sys.maxsize - struct_size) // char_size)
alloc = lambda: char * maxlen
self.assertRaises(MemoryError, alloc)
self.assertRaises(MemoryError, alloc)
with self.subTest(char=char):
self.assertRaises(MemoryError, alloc)
self.assertRaises(MemoryError, alloc)

def test_format_subclass(self):
class S(str):
Expand Down