mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 12:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-29941: Assert fixes (#886) (#955)

Browse source 
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.

(cherry picked from commit a00c3fd12d and 06bb4873d6)
This commit is contained in:
T. Wouters 2017-04-01 20:20:05 -07:00 • committed by GitHub
parent a71a3ad54d
commit 90e3518225
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Include/unicodeobject.h
View file

@ -2309,6 +2309,10 @@ PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy(
PyAPI_FUNC(int) _PyUnicode_CheckConsistency( PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
PyObject *op, PyObject *op,
int check_content); int check_content);
#elif !defined(NDEBUG)
/* For asserts that call _PyUnicode_CheckConsistency(), which would
* otherwise be a problem when building with asserts but without Py_DEBUG. */
#define _PyUnicode_CheckConsistency(op, check_content) PyUnicode_Check(op)
#endif #endif
#ifndef Py_LIMITED_API #ifndef Py_LIMITED_API

2
Objects/dictobject.c
View file

@ -436,7 +436,7 @@ static PyObject *empty_values[1] = { NULL };
/* #define DEBUG_PYDICT */ /* #define DEBUG_PYDICT */
#ifdef Py_DEBUG #ifndef NDEBUG
static int static int
_PyDict_CheckConsistency(PyDictObject *mp) _PyDict_CheckConsistency(PyDictObject *mp)
{ {

2
Objects/obmalloc.c
View file

@ -1227,7 +1227,7 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
_Py_AllocatedBlocks++; _Py_AllocatedBlocks++;
assert(nelem <= PY_SSIZE_T_MAX / elsize); assert(elsize == 0 || nelem <= PY_SSIZE_T_MAX / elsize);
nbytes = nelem * elsize; nbytes = nelem * elsize;
#ifdef WITH_VALGRIND #ifdef WITH_VALGRIND