Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #21639: Fix a division by zero in tracemalloc on calloc(0, 0). The

Browse source 
regression was introduced recently with the introduction of the new "calloc"
functions (PyMem_RawCalloc, PyMem_Calloc, PyObject_Calloc).

Add also a unit test to check for the non-regression.
This commit is contained in:
Victor Stinner 2014-06-02 21:40:22 +02:00
commit aa0e7afa43
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_tracemalloc.py
View file

@ -807,6 +807,12 @@ def test_sys_xoptions_invalid(self):
b'number of frames',
stderr)
def test_pymem_alloc0(self):
# Issue #21639: Check that PyMem_Malloc(0) with tracemalloc enabled
# does not crash.
code = 'import _testcapi; _testcapi.test_pymem_alloc0(); 1'
assert_python_ok('-X', 'tracemalloc', '-c', code)
def test_main():
support.run_unittest(

2
Modules/_tracemalloc.c
View file

@ -478,7 +478,7 @@ tracemalloc_alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize)
PyMemAllocator *alloc = (PyMemAllocator *)ctx;
void *ptr;
assert(nelem <= PY_SIZE_MAX / elsize);
assert(elsize == 0 || nelem <= PY_SIZE_MAX / elsize);
if (use_calloc)
ptr = alloc->calloc(alloc->ctx, nelem, elsize);