Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #16971: Fix a refleak in the charmap decoder.

This commit is contained in:
Serhiy Storchaka 2013-01-29 12:16:57 +02:00
parent 6de7099165 afb1cb5579
commit 2aee6a6460
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Objects/unicodeobject.c
View File

@ -7383,27 +7383,35 @@ Error:
goto onError;
}
if (_PyUnicodeWriter_Prepare(&writer, 1, value) == -1)
if (_PyUnicodeWriter_Prepare(&writer, 1, value) == -1) {
Py_DECREF(x);
goto onError;
}
PyUnicode_WRITE(writer.kind, writer.data, writer.pos, value);
writer.pos++;
}
else if (PyUnicode_Check(x)) {
if (PyUnicode_READY(x) == -1)
if (PyUnicode_READY(x) == -1) {
Py_DECREF(x);
goto onError;
}
if (PyUnicode_GET_LENGTH(x) == 1) {
Py_UCS4 value = PyUnicode_READ_CHAR(x, 0);
if (value == 0xFFFE)
goto Undefined;
if (_PyUnicodeWriter_Prepare(&writer, 1, value) == -1)
if (_PyUnicodeWriter_Prepare(&writer, 1, value) == -1) {
Py_DECREF(x);
goto onError;
}
PyUnicode_WRITE(writer.kind, writer.data, writer.pos, value);
writer.pos++;
}
else {
writer.overallocate = 1;
if (_PyUnicodeWriter_WriteStr(&writer, x) == -1)
if (_PyUnicodeWriter_WriteStr(&writer, x) == -1) {
Py_DECREF(x);
goto onError;
}
}
}
else {