Issue #21233: Oops, Fix _PyObject_Alloc(): initialize nbytes before going to

redirect.

Issue #21233: Oops, Fix _PyObject_Alloc(): initialize nbytes before going to
redirect.
af8fc645 · Victor Stinner · db067af1 · af8fc645
Commit af8fc645 authored May 02, 2014 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Objects/obmalloc.c Objects/obmalloc.c +3 -3

No files found.
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1183,12 +1183,12 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
        goto redirect;
 #endif

-    if (nelem == 0 || elsize == 0)
-        goto redirect;
-
    assert(nelem <= PY_SSIZE_T_MAX / elsize);
    nbytes = nelem * elsize;

+    if (nelem == 0 || elsize == 0)
+        goto redirect;
+
    if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
        LOCK();
        /*