commit d1ab6089ff2b4f1277676a5feac11d311b2c52ab
author Benjamin Peterson <benjamin@python.org> Fri Jun 01 11:18:22 2012 -0700
committer Benjamin Peterson <benjamin@python.org> Fri Jun 01 11:18:22 2012 -0700
tree 324c138f2072605f2be1198d4375b8c0332bb39e
parent 77452fc12121a333397ea262a3d29bdb8cbc7a57

check return for error

Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index 718bb32..b3ec013 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3107,6 +3107,8 @@
         tail = PyUnicode_FromFormat(", %U, and %U",
                                     PyList_GET_ITEM(names, len - 2),
                                     PyList_GET_ITEM(names, len - 1));
+        if (tail == NULL)
+            return;
         /* Chop off the last two objects in the list. This shouldn't actually
            fail, but we can't be too careful. */
         err = PyList_SetSlice(names, len - 2, len, NULL);