Skip to content

bpo-35090: Fix potential division by zero and integer overflow in allocator wrappers #10174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 7 commits into from
Oct 28, 2018
Merged

bpo-35090: Fix potential division by zero and integer overflow in allocator wrappers #10174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
382ff63
bpo-35090: bz2: Fix potential division by zero in BZ2_Malloc()
Oct 28, 2018
e324296
Add NEWS entry
Oct 28, 2018
51ee58e
Revert "Add NEWS entry"
Oct 28, 2018
fe6b110
Fix potential integer overflow
Oct 28, 2018
cb077ff
Explicitly use size_t as expected by PyRaw_Malloc
Oct 28, 2018
439425f
Avoid division by zero in PyLzma_Malloc()
Oct 28, 2018
0d5b385
Avoid division by zero and integer overflow in PyZlib_Malloc()
Oct 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Modules/_bz2module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,11 @@ BZ2_Malloc(void* ctx, int items, int size)
{
if (items < 0 || size < 0)
return NULL;
if ((size_t)items > (size_t)PY_SSIZE_T_MAX / (size_t)size)
if (size != 0 && (size_t)items > (size_t)PY_SSIZE_T_MAX / (size_t)size)
return NULL;
/* PyMem_Malloc() cannot be used: compress() and decompress()
release the GIL */
return PyMem_RawMalloc(items * size);
return PyMem_RawMalloc((size_t)items * (size_t)size);
}

static void
Expand Down
2 changes: 1 addition & 1 deletion Modules/_lzmamodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ catch_lzma_error(lzma_ret lzret)
static void*
PyLzma_Malloc(void *opaque, size_t items, size_t size)
{
if (items > (size_t)PY_SSIZE_T_MAX / size)
if (size != 0 && items > (size_t)PY_SSIZE_T_MAX / size)
return NULL;
/* PyMem_Malloc() cannot be used:
the GIL is not held when lzma_code() is called */
Expand Down
4 changes: 2 additions & 2 deletions Modules/zlibmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ newcompobject(PyTypeObject *type)
static void*
PyZlib_Malloc(voidpf ctx, uInt items, uInt size)
{
if (items > (size_t)PY_SSIZE_T_MAX / size)
if (size != 0 && items > (size_t)PY_SSIZE_T_MAX / size)
return NULL;
/* PyMem_Malloc() cannot be used: the GIL is not held when
inflate() and deflate() are called */
return PyMem_RawMalloc(items * size);
return PyMem_RawMalloc((size_t)items * (size_t)size);
}

static void
Expand Down