From 9ee5c37c8f8c4f35814453aecf5fdfd01dfa2781 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 26 Jul 2013 22:45:00 +0200 Subject: [PATCH] Issue #18559: Fix NULL pointer dereference error in _pickle module --- Misc/NEWS | 2 ++ Modules/_pickle.c | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 8c23a9e56bb..24b0c53f6cd 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -52,6 +52,8 @@ Core and Builtins Library ------- +- Issue #18559: Fix NULL pointer dereference error in _pickle module + - Issue #18556: Check the return value of a PyUnicode_AsWideChar() call in ctypes' U_set(). diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 0252c623398..ce573cf9f91 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -4816,9 +4816,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; } @@ -4841,9 +4842,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; }