mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Serhiy Storchaka 2013-01-29 12:13:22 +02:00
parent 1e49dde2d9
commit afb1cb5579
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Objects/unicodeobject.c
View File

@ -7510,14 +7510,18 @@ PyUnicode_DecodeCharmap(const char *s,
Py_DECREF(x);
goto onError;
}
if (unicode_putchar(&v, &outpos, value) < 0)
if (unicode_putchar(&v, &outpos, value) < 0) {
Py_DECREF(x);
goto onError;
}
}
else if (PyUnicode_Check(x)) {
Py_ssize_t targetsize;
if (PyUnicode_READY(x) == -1)
if (PyUnicode_READY(x) == -1) {
Py_DECREF(x);
goto onError;
}
targetsize = PyUnicode_GET_LENGTH(x);
if (targetsize == 1) {
@ -7525,8 +7529,10 @@ PyUnicode_DecodeCharmap(const char *s,
Py_UCS4 value = PyUnicode_READ_CHAR(x, 0);
if (value == 0xFFFE)
goto Undefined;
if (unicode_putchar(&v, &outpos, value) < 0)
if (unicode_putchar(&v, &outpos, value) < 0) {
Py_DECREF(x);
goto onError;
}
}
else if (targetsize > 1) {
/* 1-n mapping */
@ -7543,8 +7549,11 @@ PyUnicode_DecodeCharmap(const char *s,
goto onError;
}
}
if (unicode_widen(&v, outpos, PyUnicode_MAX_CHAR_VALUE(x)) < 0)
if (unicode_widen(&v, outpos,
PyUnicode_MAX_CHAR_VALUE(x)) < 0) {
Py_DECREF(x);
goto onError;
}
PyUnicode_CopyCharacters(v, outpos, x, 0, targetsize);
outpos += targetsize;
extrachars -= targetsize;