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

Issue #18559: Fix NULL pointer dereference error in _pickle module

This commit is contained in:
Christian Heimes 2013-07-26 22:45:47 +02:00
parent d4095d95f8 9ee5c37c8f
commit f446d21708
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -166,6 +166,8 @@ Core and Builtins
Library
-------
- Issue #18559: Fix NULL pointer dereference error in _pickle module
- Issue #18556: Check the return type of PyUnicode_AsWideChar() in ctype's
U_set().

10
Modules/_pickle.c
View File

@ -4836,9 +4836,10 @@ load_binget(UnpicklerObject *self)
value = _Unpickler_MemoGet(self, idx);
if (value == NULL) {
PyObject *key = PyLong_FromSsize_t(idx);
if (!PyErr_Occurred())
if (key != NULL) {
PyErr_SetObject(PyExc_KeyError, key);
Py_DECREF(key);
Py_DECREF(key);
}
return -1;
}
@ -4861,9 +4862,10 @@ load_long_binget(UnpicklerObject *self)
value = _Unpickler_MemoGet(self, idx);
if (value == NULL) {
PyObject *key = PyLong_FromSsize_t(idx);
if (!PyErr_Occurred())
if (key != NULL) {
PyErr_SetObject(PyExc_KeyError, key);
Py_DECREF(key);
Py_DECREF(key);
}
return -1;
}