traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #23321: Fixed a crash in str.decode() when error handler returned 

replacment string longer than mailformed input data.
This commit is contained in:
Serhiy Storchaka 2015-01-26 01:24:31 +02:00
parent 07985ef387 7e4b9057b3
commit bbd3aa8ece
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ Release date: TBA
Core and Builtins
-----------------
- Issue #23321: Fixed a crash in str.decode() when error handler returned
replacment string longer than mailformed input data.
- Issue #22286: The "backslashreplace" error handlers now works with
decoding and translating.

8
Objects/unicodeobject.c
View File

@ -4155,9 +4155,13 @@ unicode_decode_call_errorhandler_writer(
if (PyUnicode_READY(repunicode) < 0)
goto onError;
replen = PyUnicode_GET_LENGTH(repunicode);
writer->min_length += replen;
if (replen > 1)
if (replen > 1) {
writer->min_length += replen - 1;
writer->overallocate = 1;
if (_PyUnicodeWriter_Prepare(writer, writer->min_length,
PyUnicode_MAX_CHAR_VALUE(repunicode)) == -1)
goto onError;
}
if (_PyUnicodeWriter_WriteStr(writer, repunicode) == -1)
goto onError;