Skip to content

Commit 8afec4e

Browse files
Fix guc_malloc calls for consistency and OOM checks
check_createrole_self_grant and check_synchronized_standby_slots were allocating memory on a LOG elevel without checking if the allocation succeeded or not, which would have led to a segfault on allocation failure. On top of that, a number of callsites were using the ERROR level, relying on erroring out rather than returning false to allow the GUC machinery handle it gracefully. Other callsites used WARNING instead of LOG. While neither being not wrong, this changes all check_ functions do it consistently with LOG. init_custom_variable gets a promoted elevel to FATAL to keep the guc_malloc error handling in line with the rest of the error handling in that function which already call FATAL. If we encounter an OOM in this callsite there is no graceful handling to be had, better to error out hard. Backpatch the fix to check_createrole_self_grant down to v16 and the fix to check_synchronized_standby_slots down to v17 where they were introduced. Author: Daniel Gustafsson <daniel@yesql.se> Reported-by: Nikita <pm91.arapov@gmail.com> Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Bug: #18845 Discussion: https://postgr.es/m/18845-582c6e10247377ec@postgresql.org Backpatch-through: 16
1 parent 51d038d commit 8afec4e

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/backend/commands/user.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2553,6 +2553,8 @@ check_createrole_self_grant(char **newval, void **extra, GucSource source)
25532553
list_free(elemlist);
25542554

25552555
result = (unsigned *) guc_malloc(LOG, sizeof(unsigned));
2556+
if (!result)
2557+
return false;
25562558
*result = options;
25572559
*extra = result;
25582560

src/backend/replication/slot.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,6 +2521,8 @@ check_synchronized_standby_slots(char **newval, void **extra, GucSource source)
25212521

25222522
/* GUC extra value must be guc_malloc'd, not palloc'd */
25232523
config = (SyncStandbySlotsConfigData *) guc_malloc(LOG, size);
2524+
if (!config)
2525+
return false;
25242526

25252527
/* Transform the data into SyncStandbySlotsConfigData */
25262528
config->nslotnames = list_length(elemlist);

0 commit comments

Comments
 (0)