From 06bb4873d6a9ac303701d08a851d6cd9a51e02a3 Mon Sep 17 00:00:00 2001 From: "T. Wouters" Date: Fri, 31 Mar 2017 10:10:19 -0700 Subject: [PATCH] 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). --- Objects/obmalloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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(); /* -- 2.50.0