[Python-checkins] cpython (merge 3.3 -> default): Check return value of PyType_Ready(&EncodingMapType)

[christian.heimes]

http://hg.python.org/cpython/rev/a6891949b54a
changeset:   84731:a6891949b54a
parent:      84729:92e27be3dd62
parent:      84730:b719f041f849
user:        Christian Heimes <christian at cheimes.de>
date:        Sat Jul 20 14:57:28 2013 +0200
summary:
  Check return value of PyType_Ready(&EncodingMapType)
CID 486654

files:
  Objects/unicodeobject.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -14578,7 +14578,8 @@
         PyUnicode_2BYTE_KIND, linebreak,
         Py_ARRAY_LENGTH(linebreak));
 
-    PyType_Ready(&EncodingMapType);
+    if (PyType_Ready(&EncodingMapType) < 0)
+         Py_FatalError("Can't initialize encoding map type");
 
     if (PyType_Ready(&PyFieldNameIter_Type) < 0)
         Py_FatalError("Can't initialize field name iterator type");

-- 
Repository URL: http://hg.python.org/cpython