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

fix reference leaks in the translate fast path (closes #21175) 

Patch by Josh Rosenberg.
This commit is contained in:
Benjamin Peterson 2014-04-07 20:15:41 -04:00
parent fa7e11f8c4
commit 1365de764e
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Objects/unicodeobject.c
View File

@ -8551,28 +8551,24 @@ static int
unicode_fast_translate_lookup(PyObject *mapping, Py_UCS1 ch,
Py_UCS1 *translate)
{
PyObject *item;
PyObject *item = NULL;
int ret = 0;
item = NULL;
if (charmaptranslate_lookup(ch, mapping, &item)) {
return -1;
}
if (item == Py_None) {
/* deletion: skip fast translate */
/* deletion */
translate[ch] = 0xfe;
return 1;
}
if (item == NULL) {
else if (item == NULL) {
/* not found => default to 1:1 mapping */
translate[ch] = ch;
return 1;
}
if (PyLong_Check(item)) {
long replace = (Py_UCS4)PyLong_AS_LONG(item);
else if (PyLong_Check(item)) {
Py_UCS4 replace = (Py_UCS4)PyLong_AS_LONG(item);
/* PyLong_AS_LONG() cannot fail, charmaptranslate_lookup() already
used it */
if (127 < replace) {
@ -8598,15 +8594,13 @@ unicode_fast_translate_lookup(PyObject *mapping, Py_UCS1 ch,
translate[ch] = (Py_UCS1)replace;
}
else {
/* not a long or unicode */
/* not None, NULL, long or unicode */
goto exit;
}
Py_DECREF(item);
item = NULL;
ret = 1;
exit:
Py_XDECREF(item);
exit:
Py_DECREF(item);
return ret;
}