check for NULL to fix segfault

benjaminp · benjaminp · commit 006c5a22354e · 2012-02-19T20:36:12.000-05:00
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -1807,7 +1807,7 @@ subtype_setdict(PyObject *obj, PyObject *value, void *context)
                         "This object has no __dict__");
         return -1;
     }
-    if (!PyDict_Check(value)) {
+    if (value != NULL && !PyDict_Check(value)) {
         PyErr_Format(PyExc_TypeError,
                      "__dict__ must be set to a dictionary, "
                      "not a '%.200s'", Py_TYPE(value)->tp_name);

Original file line number	Diff line number	Diff line change
`@@ -1807,7 +1807,7 @@ subtype_setdict(PyObject obj, PyObject value, void *context)`
`1807`	`1807`	`"This object has no __dict__");`
`1808`	`1808`	`return -1;`
`1809`	`1809`	`}`
`1810`		`- if (!PyDict_Check(value)) {`
	`1810`	`+ if (value != NULL && !PyDict_Check(value)) {`
`1811`	`1811`	`PyErr_Format(PyExc_TypeError,`
`1812`	`1812`	`"__dict__ must be set to a dictionary, "`
`1813`	`1813`	`"not a '%.200s'", Py_TYPE(value)->tp_name);`