[Python-checkins] r88456 - in python/branches/py3k: Misc/NEWS Objects/typeobject.c

[martin.v.loewis]

Author: martin.v.loewis
Date: Mon Feb 21 17:24:00 2011
New Revision: 88456

Log:
- Check for NULL result in PyType_FromSpec.


Modified:
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Objects/typeobject.c

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Mon Feb 21 17:24:00 2011
@@ -7,6 +7,11 @@
 
 *Release date: XX-XXX-20XX*
 
+Core and Builtins
+-----------------
+
+- Check for NULL result in PyType_FromSpec.
+
 
 What's New in Python 3.2?
 =========================

Modified: python/branches/py3k/Objects/typeobject.c
==============================================================================
--- python/branches/py3k/Objects/typeobject.c	(original)
+++ python/branches/py3k/Objects/typeobject.c	Mon Feb 21 17:24:00 2011
@@ -2330,6 +2330,8 @@
     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;