Close #14232: catch mmap() failure in new_arena() of obmalloc
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 3d782a2..9cd6a50 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -540,6 +540,8 @@
{
struct arena_object* arenaobj;
uint excess; /* number of bytes above pool alignment */
+ void *address;
+ int err;
#ifdef PYMALLOC_DEBUG
if (Py_GETENV("PYTHONMALLOCSTATS"))
@@ -593,12 +595,14 @@
unused_arena_objects = arenaobj->nextarena;
assert(arenaobj->address == 0);
#ifdef ARENAS_USE_MMAP
- arenaobj->address = (uptr)mmap(NULL, ARENA_SIZE, PROT_READ|PROT_WRITE,
+ address = mmap(NULL, ARENA_SIZE, PROT_READ|PROT_WRITE,
MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ err = (address == MAP_FAILED);
#else
- arenaobj->address = (uptr)malloc(ARENA_SIZE);
+ address = malloc(ARENA_SIZE);
+ err = (address == 0);
#endif
- if (arenaobj->address == 0) {
+ if (err) {
/* The allocation failed: return NULL after putting the
* arenaobj back.
*/
@@ -606,6 +610,7 @@
unused_arena_objects = arenaobj;
return NULL;
}
+ arenaobj->address = (uptr)address;
++narenas_currently_allocated;
#ifdef PYMALLOC_DEBUG