From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 4 Sep 2014 15:29:52 +0000 (+0200)
Subject: Issue #21951: Fix AsObj() of the _tkinter module: raise MemoryError on memory
X-Git-Tag: v3.5.0a1~960
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60a64d6812e5d3c3bf4291081e3db9dc6acf996c;p=python

Issue #21951: Fix AsObj() of the _tkinter module: raise MemoryError on memory
allocation failure
---

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 07175944ec..4df45ad600 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -913,8 +913,10 @@ AsObj(PyObject *value)
             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);