Skip to content

Commit

Permalink
[3.12] gh-127903: Fix a crash on debug builds when calling `Objects/u…
Browse files Browse the repository at this point in the history
…nicodeobject::_copy_characters` (GH-127876) (#128459)

gh-127903: Fix a crash on debug builds when calling `Objects/unicodeobject::_copy_characters`` (GH-127876)
(cherry picked from commit 46cb634)

Co-authored-by: Alexander Shadchin <shadchin@yandex-team.com>
  • Loading branch information
miss-islington and shadchin authored Jan 3, 2025
1 parent d9e199b commit e440459
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
7 changes: 7 additions & 0 deletions Lib/test/test_unicode.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"""
import _string
import codecs
import datetime
import itertools
import operator
import pickle
Expand Down Expand Up @@ -1921,6 +1922,12 @@ def test_utf8_decode_invalid_sequences(self):
self.assertRaises(UnicodeDecodeError,
(b'\xF4'+cb+b'\xBF\xBF').decode, 'utf-8')

def test_issue127903(self):
# gh-127903: ``_copy_characters`` crashes on DEBUG builds when
# there is nothing to copy.
d = datetime.datetime(2013, 11, 10, 14, 20, 59)
self.assertEqual(d.strftime('%z'), '')

def test_issue8271(self):
# Issue #8271: during the decoding of an invalid UTF-8 byte sequence,
# only the start byte and the continuation byte(s) are now considered
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
``Objects/unicodeobject.c``: fix a crash on DEBUG builds in ``_copy_characters``
when there is nothing to copy.
9 changes: 6 additions & 3 deletions Objects/unicodeobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -1472,11 +1472,14 @@ _copy_characters(PyObject *to, Py_ssize_t to_start,
assert(PyUnicode_Check(from));
assert(from_start + how_many <= PyUnicode_GET_LENGTH(from));

assert(PyUnicode_Check(to));
assert(to_start + how_many <= PyUnicode_GET_LENGTH(to));
assert(to == NULL || PyUnicode_Check(to));

if (how_many == 0)
if (how_many == 0) {
return 0;
}

assert(to != NULL);
assert(to_start + how_many <= PyUnicode_GET_LENGTH(to));

from_kind = PyUnicode_KIND(from);
from_data = PyUnicode_DATA(from);
Expand Down

0 comments on commit e440459

Please sign in to comment.