]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-131181: Assert that PyObject_stgdict isn't NULL for PyCData (#131188)
authorAlexandra <55951388+dyupina@users.noreply.github.com>
Thu, 13 Mar 2025 15:06:39 +0000 (18:06 +0300)
committerGitHub <noreply@github.com>
Thu, 13 Mar 2025 15:06:39 +0000 (15:06 +0000)
PyCData types have stgdict, so `PyObject_stgdict` can not return NULL.
Add an assert to make this clear.

Modules/_ctypes/_ctypes.c

index 96a057554960e2de75bc703ddfb17fd0efbd3850..d3b496887b569277a9c2a1a74f5f771d324024d6 100644 (file)
@@ -2826,6 +2826,7 @@ PyCData_NewGetBuffer(PyObject *myself, Py_buffer *view, int flags)
     StgDictObject *item_dict = PyType_stgdict(item_type);
 
     if (view == NULL) return 0;
+    assert(dict);
 
     view->buf = self->b_ptr;
     view->obj = Py_NewRef(myself);
@@ -2862,7 +2863,10 @@ PyCData_reduce(PyObject *myself, PyObject *args)
 {
     CDataObject *self = (CDataObject *)myself;
 
-    if (PyObject_stgdict(myself)->flags & (TYPEFLAG_ISPOINTER|TYPEFLAG_HASPOINTER)) {
+    StgDictObject *stgdict = PyObject_stgdict(myself);
+    assert(stgdict);
+
+    if (stgdict->flags & (TYPEFLAG_ISPOINTER|TYPEFLAG_HASPOINTER)) {
         PyErr_SetString(PyExc_ValueError,
                         "ctypes objects containing pointers cannot be pickled");
         return NULL;