diff options
| author | Michael Paquier | 2025-03-04 01:53:10 +0000 |
|---|---|---|
| committer | Michael Paquier | 2025-03-04 01:53:10 +0000 |
| commit | 40d3f8274499cb1dd349f60f2e5915f907acce6e (patch) | |
| tree | 4b36a85c4044ef1c6efb8884d80c91145139adfc /src | |
| parent | ba57dcfdcda824e92eeb30b8863be8bf784908a8 (diff) | |
Add more assertions in palloc0() and palloc_extended()
palloc() includes an assertion checking that an alloc() implementation
never returns NULL for all MemoryContextMethods.
This commit adds a similar assertion in palloc0(). In palloc_extend(),
a different assertion is added, checking that MCXT_ALLOC_NO_OOM is set
when an alloc() routine returns NULL. These additions can be useful to
catch errors when implementing a new set of MemoryContextMethods
routines.
Author: Andreas Karlsson <[email protected]>
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/mmgr/mcxt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index aa6da0d0352..91060de0ab7 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1356,7 +1356,8 @@ palloc0(Size size) context->isReset = false; ret = context->methods->alloc(context, size, 0); - + /* We expect OOM to be handled by the alloc function */ + Assert(ret != NULL); VALGRIND_MEMPOOL_ALLOC(context, ret, size); MemSetAligned(ret, 0, size); @@ -1379,6 +1380,8 @@ palloc_extended(Size size, int flags) ret = context->methods->alloc(context, size, flags); if (unlikely(ret == NULL)) { + /* NULL can be returned only when using MCXT_ALLOC_NO_OOM */ + Assert(flags & MCXT_ALLOC_NO_OOM); return NULL; } |