postgres.git / summary / log / commit / refs

commit    bf048f0e17a1ea82dc22c8ad446d14670b52451c
Author:   David Rowley <drowley@postgresql.org>
Date:     Tue Aug 04 04:09:55 2026 +0000
First released in: 16.15, 17.11, 18.6

    Fix missing MCXT_ALLOC_NO_OOM handling in MemoryContextAllocAligned
    
    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


 src/backend/utils/mmgr/mcxt.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 85ee9ad9029..3654b61e68d 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -1486,6 +1486,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));


[parent: a0daa0b4127d]