Issue python#21233: Fix _PyObject_Alloc() when compiled with WITH_VALGRIND defined

vstinner · vstinner · commit 3080d926afca · 2014-05-06T11:32:29.000+02:00
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
@@ -1176,16 +1176,16 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
 
     _Py_AllocatedBlocks++;
 
+    assert(nelem <= PY_SSIZE_T_MAX / elsize);
+    nbytes = nelem * elsize;
+
 #ifdef WITH_VALGRIND
     if (UNLIKELY(running_on_valgrind == -1))
         running_on_valgrind = RUNNING_ON_VALGRIND;
     if (UNLIKELY(running_on_valgrind))
         goto redirect;
 #endif
 
-    assert(nelem <= PY_SSIZE_T_MAX / elsize);
-    nbytes = nelem * elsize;
-
     if (nelem == 0 || elsize == 0)
         goto redirect;
 
