[Python-checkins] r88457 - in python/branches/release32-maint: Misc/NEWS Objects/typeobject.c

[martin.v.loewis]

Author: martin.v.loewis
Date: Mon Feb 21 17:26:47 2011
New Revision: 88457

Log:
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.
........


Modified:
   python/branches/release32-maint/   (props changed)
   python/branches/release32-maint/Misc/NEWS
   python/branches/release32-maint/Objects/typeobject.c

Modified: python/branches/release32-maint/Misc/NEWS
==============================================================================
--- python/branches/release32-maint/Misc/NEWS	(original)
+++ python/branches/release32-maint/Misc/NEWS	Mon Feb 21 17:26:47 2011
@@ -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?
 =========================
 

Modified: python/branches/release32-maint/Objects/typeobject.c
==============================================================================
--- python/branches/release32-maint/Objects/typeobject.c	(original)
+++ python/branches/release32-maint/Objects/typeobject.c	Mon Feb 21 17:26:47 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;