From 5f2c50810a67982b0c80f6d3258fee3647f67005 Mon Sep 17 00:00:00 2001 From: Zackery Spytz Date: Sun, 31 Mar 2019 10:02:11 -0600 Subject: bpo-36150: Fix possible assertion failures due to _ctypes.c's PyCData_reduce(). (GH-12106) --- Modules/_ctypes/_ctypes.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Modules/_ctypes/_ctypes.c') diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 03f8e75609..b3a2030947 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -2743,10 +2743,11 @@ PyCData_reduce(PyObject *myself, PyObject *args) "ctypes objects containing pointers cannot be pickled"); return NULL; } - return Py_BuildValue("O(O(NN))", - _unpickle, - Py_TYPE(myself), - PyObject_GetAttrString(myself, "__dict__"), + PyObject *dict = PyObject_GetAttrString(myself, "__dict__"); + if (dict == NULL) { + return NULL; + } + return Py_BuildValue("O(O(NN))", _unpickle, Py_TYPE(myself), dict, PyBytes_FromStringAndSize(self->b_ptr, self->b_size)); } -- cgit v1.2.1