From: T. Wouters <thomas@python.org>
Date: Fri, 31 Mar 2017 17:10:19 +0000 (-0700)
Subject: Fix spurious MemoryError introduced by PR #886. (#930)
X-Git-Tag: v3.7.0a1~1027
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06bb4873d6a9ac303701d08a851d6cd9a51e02a3;p=python

Fix spurious MemoryError introduced by PR #886. (#930)

Fix MemoryError caused by moving around code in PR #886; nbytes was sometimes used unitinitalized (in non-debug builds, when use_calloc was false and elsize was 0).
---

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index f284d9fc0a..32e7ecbe1e 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1227,10 +1227,7 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
 
     _Py_AllocatedBlocks++;
 
-    if (nelem == 0 || elsize == 0)
-        goto redirect;
-
-    assert(nelem <= PY_SSIZE_T_MAX / elsize);
+    assert(elsize == 0 || nelem <= PY_SSIZE_T_MAX / elsize);
     nbytes = nelem * elsize;
 
 #ifdef WITH_VALGRIND
@@ -1240,6 +1237,9 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
         goto redirect;
 #endif
 
+    if (nelem == 0 || elsize == 0)
+        goto redirect;
+
     if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
         LOCK();
         /*