Skip to content

Commit 748e89e

Browse files
sobolevnmiss-islington
sobolevn
authored and
miss-islington
committed
gh-152228: Fix an assertion failure in str.replace under a limited memory case (GH-152229)
(cherry picked from commit c5043dc) Co-authored-by: sobolevn <[email protected]>
1 parent b066cd5 commit 748e89e

3 files changed

Lines changed: 26 additions & 9 deletions

File tree

‎Lib/test/test_str.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,21 @@ def test_replace_id(self):
600600
text = 'abc def'
601601
self.assertIs(text.replace(pattern, pattern), text)
602602

603+
@support.nomemtest
604+
def test_replace_oom(self):
605+
# https://github.com/python/cpython/issues/152228
606+
s1 = "轘" * 4
607+
s2 = "&"
608+
s3 = "&amp;"
609+
assertion = self.assertRaises(MemoryError)
610+
_testcapi.set_nomemory(0, 0)
611+
try:
612+
# No allocations made in the test itself:
613+
with assertion:
614+
s1.replace(s2, s3) # this line used to crash before
615+
finally:
616+
_testcapi.remove_mem_hooks()
617+
603618
def test_repeat_id_preserving(self):
604619
a = '123abc1@'
605620
b = '456zyx-+'

‎Misc/NEWS.d/next/Core_and_Builtins/2026-06-25-21-34-15.gh-issue-152228.a6K14K.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix an assertion failure when python is built in a debug mode
2+
that happened in :meth:`str.replace` under a limited memory situation.

‎Objects/unicodeobject.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10598,9 +10598,9 @@ replace(PyObject *self, PyObject *str1,
1059810598
}
1059910599

1060010600
done:
10601-
assert(srelease == (sbuf != PyUnicode_DATA(self)));
10602-
assert(release1 == (buf1 != PyUnicode_DATA(str1)));
10603-
assert(release2 == (buf2 != PyUnicode_DATA(str2)));
10601+
assert(srelease == (sbuf != NULL && sbuf != PyUnicode_DATA(self)));
10602+
assert(release1 == (buf1 != NULL && buf1 != PyUnicode_DATA(str1)));
10603+
assert(release2 == (buf2 != NULL && buf2 != PyUnicode_DATA(str2)));
1060410604
if (srelease)
1060510605
PyMem_Free((void *)sbuf);
1060610606
if (release1)
@@ -10612,9 +10612,9 @@ replace(PyObject *self, PyObject *str1,
1061210612

1061310613
nothing:
1061410614
/* nothing to replace; return original string (when possible) */
10615-
assert(srelease == (sbuf != PyUnicode_DATA(self)));
10616-
assert(release1 == (buf1 != PyUnicode_DATA(str1)));
10617-
assert(release2 == (buf2 != PyUnicode_DATA(str2)));
10615+
assert(srelease == (sbuf != NULL && sbuf != PyUnicode_DATA(self)));
10616+
assert(release1 == (buf1 != NULL && buf1 != PyUnicode_DATA(str1)));
10617+
assert(release2 == (buf2 != NULL && buf2 != PyUnicode_DATA(str2)));
1061810618
if (srelease)
1061910619
PyMem_Free((void *)sbuf);
1062010620
if (release1)
@@ -10624,9 +10624,9 @@ replace(PyObject *self, PyObject *str1,
1062410624
return unicode_result_unchanged(self);
1062510625

1062610626
error:
10627-
assert(srelease == (sbuf != PyUnicode_DATA(self)));
10628-
assert(release1 == (buf1 != PyUnicode_DATA(str1)));
10629-
assert(release2 == (buf2 != PyUnicode_DATA(str2)));
10627+
assert(srelease == (sbuf != NULL && sbuf != PyUnicode_DATA(self)));
10628+
assert(release1 == (buf1 != NULL && buf1 != PyUnicode_DATA(str1)));
10629+
assert(release2 == (buf2 != NULL && buf2 != PyUnicode_DATA(str2)));
1063010630
if (srelease)
1063110631
PyMem_Free((void *)sbuf);
1063210632
if (release1)

0 commit comments

Comments
 (0)