Fix custom PyType_GetModuleByDef when non-heap type object was passed (#1147)

asvetlov · bdraco · web-flow · commit cf690d5e377b · 2025-04-10T09:44:57.000-10:00
Co-authored-by: J. Nick Koston &lt;nick@koston.org&gt;
diff --git a/CHANGES/1147.bugfix.rst b/CHANGES/1147.bugfix.rst
@@ -0,0 +1 @@
+Fixed custom ``PyType_GetModuleByDef()`` when non-heap type object was passed.
diff --git a/multidict/_multilib/state.h b/multidict/_multilib/state.h
@@ -48,7 +48,9 @@ PyObject *
 PyType_GetModuleByDef(PyTypeObject *tp, PyModuleDef *def)
 {
     PyModuleDef * mod_def;
-    assert(PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE));
+    if (!PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE)) {
+        goto err;
+    }
     PyObject *mod = NULL;
 
     mod = PyType_GetModule(tp);
@@ -84,6 +86,7 @@ PyType_GetModuleByDef(PyTypeObject *tp, PyModuleDef *def)
         }
     }
 
+err:
     PyErr_Format(
         PyExc_TypeError,
         "PyType_GetModuleByDef: No superclass of '%s' has the given module",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed custom ``PyType_GetModuleByDef()`` when non-heap type object was passed.
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ PyObject *`
`48`	`48`	`PyType_GetModuleByDef(PyTypeObject tp, PyModuleDef def)`
`49`	`49`	`{`
`50`	`50`	`PyModuleDef * mod_def;`
`51`		`- assert(PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE));`
	`51`	`+ if (!PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE)) {`
	`52`	`+ goto err;`
	`53`	`+ }`
`52`	`54`	`PyObject *mod = NULL;`
`53`	`55`
`54`	`56`	`mod = PyType_GetModule(tp);`
`@@ -84,6 +86,7 @@ PyType_GetModuleByDef(PyTypeObject tp, PyModuleDef def)`
`84`	`86`	`}`
`85`	`87`	`}`
`86`	`88`
	`89`	`+err:`
`87`	`90`	`PyErr_Format(`
`88`	`91`	`PyExc_TypeError,`
`89`	`92`	`"PyType_GetModuleByDef: No superclass of '%s' has the given module",`