diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/error/elog.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 860bbd40d42..b891dab3bf6 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -2198,7 +2198,9 @@ check_backtrace_functions(char **newval, void **extra, GucSource source) * whitespace chars to save some memory, but it doesn't seem worth the * trouble. */ - someval = guc_malloc(ERROR, newvallen + 1 + 1); + someval = guc_malloc(LOG, newvallen + 1 + 1); + if (!someval) + return false; for (i = 0, j = 0; i < newvallen; i++) { if ((*newval)[i] == ',') @@ -2283,7 +2285,9 @@ check_log_destination(char **newval, void **extra, GucSource source) pfree(rawstring); list_free(elemlist); - myextra = (int *) guc_malloc(ERROR, sizeof(int)); + myextra = (int *) guc_malloc(LOG, sizeof(int)); + if (!myextra) + return false; *myextra = newlogdest; *extra = myextra; diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 12192445218..667df448732 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4909,10 +4909,11 @@ init_custom_variable(const char *name, strcmp(name, "pljava.vmoptions") == 0)) context = PGC_SUSET; - gen = (struct config_generic *) guc_malloc(ERROR, sz); + /* As above, an OOM here is FATAL */ + gen = (struct config_generic *) guc_malloc(FATAL, sz); memset(gen, 0, sz); - gen->name = guc_strdup(ERROR, name); + gen->name = guc_strdup(FATAL, name); gen->context = context; gen->group = CUSTOM_OPTIONS; gen->short_desc = short_desc; |