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

5f2c5081 · Zackery Spytz · Serhiy Storchaka · 48600c72 · 5f2c5081
Commit 5f2c5081 authored Mar 31, 2019 by Zackery Spytz Committed by Serhiy Storchaka Mar 31, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

Modules/_ctypes/_ctypes.c Modules/_ctypes/_ctypes.c +5 -4

No files found.
--- 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))",
+    PyObject *dict = PyObject_GetAttrString(myself, "__dict__");
-                         _unpickle,
+    if (dict == NULL) {
-                         Py_TYPE(myself),
+        return NULL;
-                         PyObject_GetAttrString(myself, "__dict__"),
+    }
+    return Py_BuildValue("O(O(NN))", _unpickle, Py_TYPE(myself), dict,
                         PyBytes_FromStringAndSize(self->b_ptr, self->b_size));
 }