Merged revisions 88456 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88456 | martin.v.loewis | 2011-02-21 17:24:00 +0100 (Mo, 21 Feb 2011) | 2 lines

  - Check for NULL result in PyType_FromSpec.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index c34a540820e8b2b7d15ade87590502c20e920467..dbbf2d2f2bfff67534ecb9493902154fc14dc5e7 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,17 @@
 Python News
 +++++++++++
 
+What's New in Python 3.2.1?
+===========================
+
+*Release date: XX-XXX-20XX*
+
+Core and Builtins
+-----------------
+
+- Check for NULL result in PyType_FromSpec.
+
+
 What's New in Python 3.2?
 =========================
 

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index b1fe44ebe48ce748fc74d01059df24865a959030..7a1aa77e3f7e8f991551ac7fdddb453e157091ca 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2330,6 +2330,8 @@ PyObject* PyType_FromSpec(PyType_Spec *spec)
     char *res_start = (char*)res;
     PyType_Slot *slot;
 
+    if (res == NULL)
+      return NULL;
     res->ht_name = PyUnicode_FromString(spec->name);
     if (!res->ht_name)
        goto fail;