database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00
Code Activity

Fix missing MCXT_ALLOC_NO_OOM handling in MemoryContextAllocAligned

Browse Source 
Fix missing NULL check in MemoryContextAllocAligned().  The underlying
call to MemoryContextAllocExtended() could return NULL when
flags contains MCXT_ALLOC_NO_OOM and the underlying malloc fails.

There are no current callers using MemoryContextAllocAligned() that pass
the MCXT_ALLOC_NO_OOM in core, so no live bug fix in core here. However,
an extension might use this pattern, so we'd better fix.

Fix this so we correctly pass the NULL to the caller rather than trying
to write to a NULL memory address.

This also fixes the same bug in AlignedAllocRealloc(), which is also
unused in core.

Backpatch to v16, where these functions first appeared.

Author: Chao Li <li.evan.chao@gmail.com>
Discussion: https://postgr.es/m/07DAC4C3-120D-4F3C-8FEE-BA236F7E9C1D@gmail.com
Backpatch-through: 16
This commit is contained in:
David Rowley
2026-08-04 16:10:18 +12:00
parent 25e54cec72
commit cce758797f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/utils/mmgr/mcxt.c
View File

@@ -1478,6 +1478,13 @@ MemoryContextAllocAligned(MemoryContext context,
/* perform the actual allocation */
unaligned = MemoryContextAllocExtended(context, alloc_size, flags);
if (unlikely(unaligned == NULL))
{
/* NULL can be returned only when using MCXT_ALLOC_NO_OOM */
Assert(flags & MCXT_ALLOC_NO_OOM);
return NULL;
}
/* set the aligned pointer */
aligned = (void *) TYPEALIGN(alignto, (char *) unaligned +
sizeof(MemoryChunk));