traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Victor Stinner 2014-05-06 11:32:29 +02:00
parent 8c9f480e9c
commit 3080d926af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/obmalloc.c
View File

@ -1176,6 +1176,9 @@ _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;
@ -1183,9 +1186,6 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
goto redirect;
#endif
assert(nelem <= PY_SSIZE_T_MAX / elsize);
nbytes = nelem * elsize;
if (nelem == 0 || elsize == 0)
goto redirect;