]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-36150: Fix possible assertion failures due to _ctypes.c's PyCData_reduce(). ...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sun, 31 Mar 2019 17:15:11 +0000 (10:15 -0700)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 31 Mar 2019 17:15:11 +0000 (20:15 +0300)
(cherry picked from commit 5f2c50810a67982b0c80f6d3258fee3647f67005)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Modules/_ctypes/_ctypes.c

index 48ad696e10783b147d4d075b6d3e1c2621957180..be0b321bad035fe9a53c1c6e1b5bc08737a4d2e8 100644 (file)
@@ -2663,10 +2663,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));
 }