pythongh-114414: Assert PyType_GetModuleByDef result in _threadmodule (python#114415)

sobolevn · Glyphack · commit 532b409d97d8 · 2024-01-27T10:36:34.000+01:00
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
@@ -901,6 +901,7 @@ local_new(PyTypeObject *type, PyObject *args, PyObject *kw)
     }
 
     PyObject *module = PyType_GetModuleByDef(type, &thread_module);
+    assert(module != NULL);
     thread_module_state *state = get_thread_state(module);
 
     localobject *self = (localobject *)type->tp_alloc(type, 0);
@@ -1042,6 +1043,7 @@ static int
 local_setattro(localobject *self, PyObject *name, PyObject *v)
 {
     PyObject *module = PyType_GetModuleByDef(Py_TYPE(self), &thread_module);
+    assert(module != NULL);
     thread_module_state *state = get_thread_state(module);
 
     PyObject *ldict = _ldict(self, state);
@@ -1094,6 +1096,7 @@ static PyObject *
 local_getattro(localobject *self, PyObject *name)
 {
     PyObject *module = PyType_GetModuleByDef(Py_TYPE(self), &thread_module);
+    assert(module != NULL);
     thread_module_state *state = get_thread_state(module);
 
     PyObject *ldict = _ldict(self, state);

Original file line number	Diff line number	Diff line change
`@@ -901,6 +901,7 @@ local_new(PyTypeObject type, PyObject args, PyObject *kw)`
`901`	`901`	`}`
`902`	`902`
`903`	`903`	`PyObject *module = PyType_GetModuleByDef(type, &thread_module);`
	`904`	`+ assert(module != NULL);`
`904`	`905`	`thread_module_state *state = get_thread_state(module);`
`905`	`906`
`906`	`907`	`localobject self = (localobject )type->tp_alloc(type, 0);`
`@@ -1042,6 +1043,7 @@ static int`
`1042`	`1043`	`local_setattro(localobject self, PyObject name, PyObject *v)`
`1043`	`1044`	`{`
`1044`	`1045`	`PyObject *module = PyType_GetModuleByDef(Py_TYPE(self), &thread_module);`
	`1046`	`+ assert(module != NULL);`
`1045`	`1047`	`thread_module_state *state = get_thread_state(module);`
`1046`	`1048`
`1047`	`1049`	`PyObject *ldict = _ldict(self, state);`
`@@ -1094,6 +1096,7 @@ static PyObject *`
`1094`	`1096`	`local_getattro(localobject self, PyObject name)`
`1095`	`1097`	`{`
`1096`	`1098`	`PyObject *module = PyType_GetModuleByDef(Py_TYPE(self), &thread_module);`
	`1099`	`+ assert(module != NULL);`
`1097`	`1100`	`thread_module_state *state = get_thread_state(module);`
`1098`	`1101`
`1099`	`1102`	`PyObject *ldict = _ldict(self, state);`