commit a1a807b6efdbdaa0af7da4aff46a4a205d87e8f9
author Victor Stinner <victor.stinner@haypocalc.com> Thu May 26 14:24:30 2011 +0200
committer Victor Stinner <victor.stinner@haypocalc.com> Thu May 26 14:24:30 2011 +0200
tree 510ea4776cb20446d8d1e771a0233c9d7ddaf371
parent 5572ba7e15b462098aac2def8e85e59b055689c3

set_repr(): handle correctly PyUnicode_FromUnicode() error (MemoryError)

Bug found by the Clang Static Analyzer.

Objects/setobject.c

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 22243ea..ebfddb3 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -607,16 +607,18 @@
         goto done;
     newsize = PyUnicode_GET_SIZE(listrepr);
     result = PyUnicode_FromUnicode(NULL, newsize);
-    if (result) {
-        u = PyUnicode_AS_UNICODE(result);
-        *u++ = '{';
-        /* Omit the brackets from the listrepr */
-        Py_UNICODE_COPY(u, PyUnicode_AS_UNICODE(listrepr)+1,
-                           newsize-2);
-        u += newsize-2;
-        *u = '}';
-    }
+    if (result == NULL)
+        goto done;
+
+    u = PyUnicode_AS_UNICODE(result);
+    *u++ = '{';
+    /* Omit the brackets from the listrepr */
+    Py_UNICODE_COPY(u, PyUnicode_AS_UNICODE(listrepr)+1,
+                       newsize-2);
+    u += newsize-2;
+    *u = '}';
     Py_DECREF(listrepr);
+
     if (Py_TYPE(so) != &PySet_Type) {
         PyObject *tmp = PyUnicode_FromFormat("%s(%U)",
                                              Py_TYPE(so)->tp_name,