mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-126004: Fix positions handling in codecs.replace_errors (#127674)

Browse source 
This fixes how `PyCodec_ReplaceErrors` handles the `start` and `end` attributes
of `UnicodeError` objects via the `_PyUnicodeError_GetParams` helper.
This commit is contained in:
Bénédikt Tran 2025-01-23 11:44:18 +01:00 • committed by GitHub
parent 70dcc847df
commit 225296cd5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_capi/test_codecs.py
View file

@ -839,7 +839,8 @@ class CAPICodecErrors(unittest.TestCase):
def test_codec_replace_errors_handler(self): def test_codec_replace_errors_handler(self):
handler = _testcapi.codec_replace_errors handler = _testcapi.codec_replace_errors
self.do_test_codec_errors_handler(handler, self.all_unicode_errors) self.do_test_codec_errors_handler(handler, self.all_unicode_errors,
safe=True)
def test_codec_xmlcharrefreplace_errors_handler(self): def test_codec_xmlcharrefreplace_errors_handler(self):
handler = _testcapi.codec_xmlcharrefreplace_errors handler = _testcapi.codec_xmlcharrefreplace_errors

3
Misc/NEWS.d/next/Core_and_Builtins/2024-12-06-11-32-58.gh-issue-126004.CYAwTB.rst Normal file
View file

@ -0,0 +1,3 @@
Fix handling of :attr:`UnicodeError.start` and :attr:`UnicodeError.end`
values in the :func:`codecs.replace_errors` error handler. Patch by Bénédikt
Tran.

46
Python/codecs.c
View file

@ -702,48 +702,46 @@ PyObject *PyCodec_IgnoreErrors(PyObject *exc)
PyObject *PyCodec_ReplaceErrors(PyObject *exc) PyObject *PyCodec_ReplaceErrors(PyObject *exc)
{ {
Py_ssize_t start, end, i, len; Py_ssize_t start, end, slen;
if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) { if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
PyObject *res; if (_PyUnicodeError_GetParams(exc, NULL, NULL,
Py_UCS1 *outp; &start, &end, &slen, false) < 0) {
if (PyUnicodeEncodeError_GetStart(exc, &start))
return NULL; return NULL;
if (PyUnicodeEncodeError_GetEnd(exc, &end)) }
return NULL; PyObject *res = PyUnicode_New(slen, '?');
len = end - start; if (res == NULL) {
res = PyUnicode_New(len, '?');
if (res == NULL)
return NULL; return NULL;
}
assert(PyUnicode_KIND(res) == PyUnicode_1BYTE_KIND); assert(PyUnicode_KIND(res) == PyUnicode_1BYTE_KIND);
outp = PyUnicode_1BYTE_DATA(res); Py_UCS1 *outp = PyUnicode_1BYTE_DATA(res);
for (i = 0; i < len; ++i) memset(outp, '?', sizeof(Py_UCS1) * slen);
outp[i] = '?';
assert(_PyUnicode_CheckConsistency(res, 1)); assert(_PyUnicode_CheckConsistency(res, 1));
return Py_BuildValue("(Nn)", res, end); return Py_BuildValue("(Nn)", res, end);
} }
else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) { else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) {
if (PyUnicodeDecodeError_GetEnd(exc, &end)) if (_PyUnicodeError_GetParams(exc, NULL, NULL,
NULL, &end, NULL, true) < 0) {
return NULL; return NULL;
}
return Py_BuildValue("(Cn)", return Py_BuildValue("(Cn)",
(int)Py_UNICODE_REPLACEMENT_CHARACTER, (int)Py_UNICODE_REPLACEMENT_CHARACTER,
end); end);
} }
else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeTranslateError)) { else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeTranslateError)) {
PyObject *res; if (_PyUnicodeError_GetParams(exc, NULL, NULL,
Py_UCS2 *outp; &start, &end, &slen, false) < 0) {
if (PyUnicodeTranslateError_GetStart(exc, &start))
return NULL; return NULL;
if (PyUnicodeTranslateError_GetEnd(exc, &end)) }
PyObject *res = PyUnicode_New(slen, Py_UNICODE_REPLACEMENT_CHARACTER);
if (res == NULL) {
return NULL; return NULL;
len = end - start; }
res = PyUnicode_New(len, Py_UNICODE_REPLACEMENT_CHARACTER); assert(slen == 0 || PyUnicode_KIND(res) == PyUnicode_2BYTE_KIND);
if (res == NULL) Py_UCS2 *outp = PyUnicode_2BYTE_DATA(res);
return NULL; for (Py_ssize_t i = 0; i < slen; ++i) {
assert(PyUnicode_KIND(res) == PyUnicode_2BYTE_KIND);
outp = PyUnicode_2BYTE_DATA(res);
for (i = 0; i < len; i++)
outp[i] = Py_UNICODE_REPLACEMENT_CHARACTER; outp[i] = Py_UNICODE_REPLACEMENT_CHARACTER;
}
assert(_PyUnicode_CheckConsistency(res, 1)); assert(_PyUnicode_CheckConsistency(res, 1));
return Py_BuildValue("(Nn)", res, end); return Py_BuildValue("(Nn)", res, end);
} }