From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 31 Mar 2019 17:15:11 +0000 (-0700)
Subject: bpo-36150: Fix possible assertion failures due to _ctypes.c's PyCData_reduce(). ... 
X-Git-Tag: v3.7.4rc1~273
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e233951d931acc0e927100c51e9a27a2791b6a5;p=thirdparty%2FPython%2Fcpython.git

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

(cherry picked from commit 5f2c50810a67982b0c80f6d3258fee3647f67005)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
---

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 48ad696e1078..be0b321bad03 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -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));
 }