diff options
| author | T. Wouters <thomas@python.org> | 2017-03-31 16:14:41 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 16:14:41 (GMT) |
| commit | a00c3fd12d421e41b769debd7df717d17b0deed5 (patch) | |
| tree | f25a9a879cbdda7216326adf84a0a54dca20ad3b /Objects/obmalloc.c | |
| parent | 164d30eb1e66575dafee6af4fca4cbf52c7fbe6a (diff) | |
| download | cpython-a00c3fd12d421e41b769debd7df717d17b0deed5.zip cpython-a00c3fd12d421e41b769debd7df717d17b0deed5.tar.gz cpython-a00c3fd12d421e41b769debd7df717d17b0deed5.tar.bz2 | |
bpo-29941: Assert fixes (#886)
Make a non-Py_DEBUG, asserts-enabled build of CPython possible. This means
making sure helper functions are defined when NDEBUG is not defined, not
just when Py_DEBUG is defined.
Also fix a division-by-zero in obmalloc.c that went unnoticed because in Py_DEBUG mode, elsize is never zero.
Diffstat (limited to 'Objects/obmalloc.c')
| -rw-r--r-- | Objects/obmalloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index a1142f3..f284d9f 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -1227,6 +1227,9 @@ _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); nbytes = nelem * elsize; @@ -1237,9 +1240,6 @@ _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(); /* |