changeset:   90565:358a12f4d4bc
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Tue May 06 11:32:29 2014 +0200
files:       Objects/obmalloc.c
description:
Issue #21233: Fix _PyObject_Alloc() when compiled with WITH_VALGRIND defined


diff -r e791a36ab6a2 -r 358a12f4d4bc Objects/obmalloc.c
--- a/Objects/obmalloc.c	Mon May 05 20:59:50 2014 +0100
+++ b/Objects/obmalloc.c	Tue May 06 11:32:29 2014 +0200
@@ -1176,6 +1176,9 @@
 
     _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;
@@ -1183,9 +1186,6 @@
         goto redirect;
 #endif
 
-    assert(nelem <= PY_SSIZE_T_MAX / elsize);
-    nbytes = nelem * elsize;
-
     if (nelem == 0 || elsize == 0)
         goto redirect;