Skip to content
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

gh-126004: fix positions handling in codecs.backslashreplace_errors #127676

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+73 −68
Open

gh-126004: fix positions handling in codecs.backslashreplace_errors #127676

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c85e59c
fix `codecs.backslashreplace_errors`
picnixz Dec 6, 2024
cfc4c9b
blurb
picnixz Dec 6, 2024
2649ab7
fix warnings
picnixz Dec 6, 2024
9558928
cosmetic changes
picnixz Dec 6, 2024
11a9431
Merge remote-tracking branch 'upstream/main' into fix/codecs/backslas…
picnixz Jan 3, 2025
08be0a7
use internal `_PyUnicodeError_GetParams` helper
picnixz Jan 3, 2025
564ba70
Update Python/codecs.c
picnixz Jan 3, 2025
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
7 changes: 4 additions & 3 deletions Lib/test/test_capi/test_codecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,18 +847,19 @@ def test_codec_xmlcharrefreplace_errors_handler(self):

def test_codec_backslashreplace_errors_handler(self):
handler = _testcapi.codec_backslashreplace_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_namereplace_errors_handler(self):
handler = _testlimitedcapi.codec_namereplace_errors
self.do_test_codec_errors_handler(handler, self.unicode_encode_errors)

def do_test_codec_errors_handler(self, handler, exceptions):
def do_test_codec_errors_handler(self, handler, exceptions, *, safe=False):
at_least_one = False
for exc in exceptions:
# See https://github.com/python/cpython/issues/123378 and related
# discussion and issues for details.
if self._exception_may_crash(exc):
if not safe and self._exception_may_crash(exc):
continue

at_least_one = True
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2024-12-06-11-30-58.gh-issue-126004.-p8MAS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix handling of :attr:`UnicodeError.start` and :attr:`UnicodeError.end`
values in the :func:`codecs.backslashreplace_errors` error handler. Patch by
Bénédikt Tran.
131 changes: 66 additions & 65 deletions Python/codecs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,109 +853,110 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)

PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
{
PyObject *object;
Py_ssize_t i;
Py_ssize_t start;
Py_ssize_t end;
PyObject *res;
Py_UCS1 *outp;
int ressize;
Py_UCS4 c;

PyObject *obj;
Py_ssize_t objlen, start, end;
if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeDecodeError)) {
const unsigned char *p;
if (PyUnicodeDecodeError_GetStart(exc, &start))
return NULL;
if (PyUnicodeDecodeError_GetEnd(exc, &end))
return NULL;
if (!(object = PyUnicodeDecodeError_GetObject(exc)))
if (_PyUnicodeError_GetParams(exc,
&obj, &objlen, &start, &end, true) < 0)
{
return NULL;
p = (const unsigned char*)PyBytes_AS_STRING(object);
res = PyUnicode_New(4 * (end - start), 127);
}
if (end <= start) {
Py_DECREF(obj);
goto oob;
}
const unsigned char *p = (const unsigned char *)PyBytes_AS_STRING(obj);
PyObject *res = PyUnicode_New(4 * (end - start), 127);
if (res == NULL) {
Py_DECREF(object);
Py_DECREF(obj);
return NULL;
}
outp = PyUnicode_1BYTE_DATA(res);
for (i = start; i < end; i++, outp += 4) {
unsigned char c = p[i];
Py_UCS1 *outp = PyUnicode_1BYTE_DATA(res);
for (Py_ssize_t i = start; i < end; i++, outp += 4) {
const unsigned char ch = p[i];
outp[0] = '\\';
outp[1] = 'x';
outp[2] = Py_hexdigits[(c>>4)&0xf];
outp[3] = Py_hexdigits[c&0xf];
outp[2] = Py_hexdigits[(ch >> 4) & 0xf];
outp[3] = Py_hexdigits[ch & 0xf];
}

assert(_PyUnicode_CheckConsistency(res, 1));
Py_DECREF(object);
Py_DECREF(obj);
return Py_BuildValue("(Nn)", res, end);
}
if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)) {
if (PyUnicodeEncodeError_GetStart(exc, &start))
return NULL;
if (PyUnicodeEncodeError_GetEnd(exc, &end))
return NULL;
if (!(object = PyUnicodeEncodeError_GetObject(exc)))
return NULL;
}
else if (PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeTranslateError)) {
if (PyUnicodeTranslateError_GetStart(exc, &start))
return NULL;
if (PyUnicodeTranslateError_GetEnd(exc, &end))
return NULL;
if (!(object = PyUnicodeTranslateError_GetObject(exc)))

if (
PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeEncodeError)
|| PyObject_TypeCheck(exc, (PyTypeObject *)PyExc_UnicodeTranslateError)
) {
if (_PyUnicodeError_GetParams(exc,
&obj, &objlen, &start, &end, false) < 0)
{
return NULL;
}
}
else {
wrong_exception_type(exc);
return NULL;
}

if (end - start > PY_SSIZE_T_MAX / (1+1+8))
end = start + PY_SSIZE_T_MAX / (1+1+8);
for (i = start, ressize = 0; i < end; ++i) {
if (end <= start) {
Py_DECREF(obj);
goto oob;
}
if (end - start > PY_SSIZE_T_MAX / 10) {
end = start + PY_SSIZE_T_MAX / 10;
}
end = Py_MIN(end, PyUnicode_GET_LENGTH(obj));
picnixz marked this conversation as resolved.
Show resolved Hide resolved

Py_ssize_t ressize = 0;
for (Py_ssize_t i = start; i < end; ++i) {
/* object is guaranteed to be "ready" */
c = PyUnicode_READ_CHAR(object, i);
Py_UCS4 c = PyUnicode_READ_CHAR(obj, i);
if (c >= 0x10000) {
ressize += 1+1+8;
ressize += 10;
}
else if (c >= 0x100) {
ressize += 1+1+4;
ressize += 6;
}
else {
ressize += 4;
}
else
ressize += 1+1+2;
}
res = PyUnicode_New(ressize, 127);
PyObject *res = PyUnicode_New(ressize, 127);
if (res == NULL) {
Py_DECREF(object);
Py_DECREF(obj);
return NULL;
}
outp = PyUnicode_1BYTE_DATA(res);
for (i = start; i < end; ++i) {
c = PyUnicode_READ_CHAR(object, i);
Py_UCS1 *outp = PyUnicode_1BYTE_DATA(res);
for (Py_ssize_t i = start; i < end; ++i) {
Py_UCS4 c = PyUnicode_READ_CHAR(obj, i);
*outp++ = '\\';
if (c >= 0x00010000) {
*outp++ = 'U';
*outp++ = Py_hexdigits[(c>>28)&0xf];
*outp++ = Py_hexdigits[(c>>24)&0xf];
*outp++ = Py_hexdigits[(c>>20)&0xf];
*outp++ = Py_hexdigits[(c>>16)&0xf];
*outp++ = Py_hexdigits[(c>>12)&0xf];
*outp++ = Py_hexdigits[(c>>8)&0xf];
*outp++ = Py_hexdigits[(c >> 28) & 0xf];
*outp++ = Py_hexdigits[(c >> 24) & 0xf];
*outp++ = Py_hexdigits[(c >> 20) & 0xf];
*outp++ = Py_hexdigits[(c >> 16) & 0xf];
*outp++ = Py_hexdigits[(c >> 12) & 0xf];
*outp++ = Py_hexdigits[(c >> 8) & 0xf];
}
else if (c >= 0x100) {
*outp++ = 'u';
*outp++ = Py_hexdigits[(c>>12)&0xf];
*outp++ = Py_hexdigits[(c>>8)&0xf];
*outp++ = Py_hexdigits[(c >> 12) & 0xf];
*outp++ = Py_hexdigits[(c >> 8) & 0xf];
}
else
else {
*outp++ = 'x';
*outp++ = Py_hexdigits[(c>>4)&0xf];
*outp++ = Py_hexdigits[c&0xf];
}
*outp++ = Py_hexdigits[(c >> 4) & 0xf];
*outp++ = Py_hexdigits[c & 0xf];
}

assert(_PyUnicode_CheckConsistency(res, 1));
Py_DECREF(object);
Py_DECREF(obj);
return Py_BuildValue("(Nn)", res, end);

oob:
return Py_BuildValue("(Nn)", Py_GetConstant(Py_CONSTANT_EMPTY_STR), end);
}

PyObject *PyCodec_NameReplaceErrors(PyObject *exc)
Expand Down
Loading