changeset:   92334:9ab404cdcaa1
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Thu Sep 04 17:29:52 2014 +0200
files:       Modules/_tkinter.c
description:
Issue #21951: Fix AsObj() of the _tkinter module: raise MemoryError on memory
allocation failure


diff -r 554ead559f24 -r 9ab404cdcaa1 Modules/_tkinter.c
--- a/Modules/_tkinter.c	Thu Sep 04 01:42:29 2014 -0700
+++ b/Modules/_tkinter.c	Thu Sep 04 17:29:52 2014 +0200
@@ -913,8 +913,10 @@
             return NULL;
         }
         argv = (Tcl_Obj **) ckalloc(((size_t)size) * sizeof(Tcl_Obj *));
-        if(!argv)
-          return 0;
+        if(!argv) {
+          PyErr_NoMemory();
+          return NULL;
+        }
         for (i = 0; i < size; i++)
           argv[i] = AsObj(PySequence_Fast_GET_ITEM(value,i));
         result = Tcl_NewListObj(size, argv);