1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christian Heimes 2013-07-26 22:45:00 +02:00
parent 66eda26a72
commit 9ee5c37c8f
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

@ -52,6 +52,8 @@ Core and Builtins
Library Library
------- -------
- Issue #18559: Fix NULL pointer dereference error in _pickle module
- Issue #18556: Check the return value of a PyUnicode_AsWideChar() call in - Issue #18556: Check the return value of a PyUnicode_AsWideChar() call in
ctypes' U_set(). ctypes' U_set().

6
Modules/_pickle.c
View File

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