Skip to content

[3.7] bpo-37732: Fix GCC warning in _PyObject_Malloc() (GH-15333) (GH-15342) #15343

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
merged 1 commit into from
Aug 20, 2019
Merged

[3.7] bpo-37732: Fix GCC warning in _PyObject_Malloc() (GH-15333) (GH-15342) #15343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 13 additions & 15 deletions Objects/obmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,13 +1377,13 @@ address_in_range(void *p, poolp pool)
block allocations typically result in a couple of instructions).
Unless the optimizer reorders everything, being too smart...

Return 1 if pymalloc allocated memory and wrote the pointer into *ptr_p.
Return a pointer to newly allocated memory if pymalloc allocated memory.

Return 0 if pymalloc failed to allocate the memory block: on bigger
Return NULL if pymalloc failed to allocate the memory block: on bigger
requests, on error in the code below (as a last chance to serve the request)
or when the max memory limit has been reached. */
static int
pymalloc_alloc(void *ctx, void **ptr_p, size_t nbytes)
static void*
pymalloc_alloc(void *ctx, size_t nbytes)
{
block *bp;
poolp pool;
Expand All @@ -1395,15 +1395,15 @@ pymalloc_alloc(void *ctx, void **ptr_p, size_t nbytes)
running_on_valgrind = RUNNING_ON_VALGRIND;
}
if (UNLIKELY(running_on_valgrind)) {
return 0;
return NULL;
}
#endif

if (nbytes == 0) {
return 0;
return NULL;
}
if (nbytes > SMALL_REQUEST_THRESHOLD) {
return 0;
return NULL;
}

LOCK();
Expand Down Expand Up @@ -1564,20 +1564,19 @@ pymalloc_alloc(void *ctx, void **ptr_p, size_t nbytes)
success:
UNLOCK();
assert(bp != NULL);
*ptr_p = (void *)bp;
return 1;
return (void *)bp;

failed:
UNLOCK();
return 0;
return NULL;
}


static void *
_PyObject_Malloc(void *ctx, size_t nbytes)
{
void* ptr;
if (pymalloc_alloc(ctx, &ptr, nbytes)) {
void* ptr = pymalloc_alloc(ctx, nbytes);
if (ptr != NULL) {
_Py_AllocatedBlocks++;
return ptr;
}
Expand All @@ -1593,12 +1592,11 @@ _PyObject_Malloc(void *ctx, size_t nbytes)
static void *
_PyObject_Calloc(void *ctx, size_t nelem, size_t elsize)
{
void* ptr;

assert(elsize == 0 || nelem <= (size_t)PY_SSIZE_T_MAX / elsize);
size_t nbytes = nelem * elsize;

if (pymalloc_alloc(ctx, &ptr, nbytes)) {
void *ptr = pymalloc_alloc(ctx, nbytes);
if (ptr != NULL) {
memset(ptr, 0, nbytes);
_Py_AllocatedBlocks++;
return ptr;
Expand Down