bpo-36150: Fix possible assertion failures due to _ctypes.c's PyCData_reduce(). (GH-12106)

https://github.com/python/cpython/commit/5f2c50810a67982b0c80f6d3258fee3647f... commit: 5f2c50810a67982b0c80f6d3258fee3647f67005 branch: master author: Zackery Spytz <zspytz@gmail.com> committer: Serhiy Storchaka <storchaka@gmail.com> date: 2019-03-31T19:02:11+03:00 summary: bpo-36150: Fix possible assertion failures due to _ctypes.c's PyCData_reduce(). (GH-12106) files: M Modules/_ctypes/_ctypes.c diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 03f8e756092c..b3a20309472d 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)); }
participants (1)
-
Serhiy Storchaka