mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-09 02:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-37732: Fix GCC warning in _PyObject_Malloc() (GH-15333)

Browse source 
pymalloc_alloc() now returns directly the pointer, return NULL on
memory allocation error.

allocate_from_new_pool() already uses NULL as marker for "allocation
failed".
This commit is contained in:
Victor Stinner 2019-08-20 12:28:02 +01:00 • committed by GitHub
parent b0f4dab873
commit 18f8dcfa10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Objects/obmalloc.c
View file

@ -1580,29 +1580,29 @@ allocate_from_new_pool(uint size)
/* pymalloc allocator
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 inline int
pymalloc_alloc(void *ctx, void **ptr_p, size_t nbytes)
static inline void*
pymalloc_alloc(void *ctx, size_t nbytes)
{
#ifdef WITH_VALGRIND
if (UNLIKELY(running_on_valgrind == -1)) {
running_on_valgrind = RUNNING_ON_VALGRIND;
}
if (UNLIKELY(running_on_valgrind)) {
return 0;
return NULL;
}
#endif
if (UNLIKELY(nbytes == 0)) {
return 0;
return NULL;
}
if (UNLIKELY(nbytes > SMALL_REQUEST_THRESHOLD)) {
return 0;
return NULL;
}
uint size = (uint)(nbytes - 1) >> ALIGNMENT_SHIFT;
@ -1616,6 +1616,7 @@ pymalloc_alloc(void *ctx, void **ptr_p, size_t nbytes)
*/
++pool->ref.count;
bp = pool->freeblock;
assert(bp != NULL);
if (UNLIKELY((pool->freeblock = *(block **)bp) == NULL)) {
// Reached the end of the free list, try to extend it.
@ -1627,22 +1628,17 @@ pymalloc_alloc(void *ctx, void **ptr_p, size_t nbytes)
* available: use a free pool.
*/
bp = allocate_from_new_pool(size);
if (UNLIKELY(bp == NULL)) {
return 0;
}
}
assert(bp != NULL);
*ptr_p = (void *)bp;
return 1;
return (void *)bp;
}
static void *
_PyObject_Malloc(void *ctx, size_t nbytes)
{
void* ptr;
if (LIKELY(pymalloc_alloc(ctx, &ptr, nbytes))) {
void* ptr = pymalloc_alloc(ctx, nbytes);
if (LIKELY(ptr != NULL)) {
return ptr;
}
@ -1657,12 +1653,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 (LIKELY(pymalloc_alloc(ctx, &ptr, nbytes))) {
void* ptr = pymalloc_alloc(ctx, nbytes);
if (LIKELY(ptr != NULL)) {
memset(ptr, 0, nbytes);
return ptr;
}