diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/fmgr/fmgr.c | 15 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 12 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index 6b2d7d7be38..9dfdf890c51 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -669,7 +669,8 @@ fmgr_security_definer(PG_FUNCTION_ARGS) &isnull); if (!isnull) { - ArrayType *array; + ArrayType *array; + oldcxt = MemoryContextSwitchTo(fcinfo->flinfo->fn_mcxt); array = DatumGetArrayTypeP(datum); TransformGUCArray(array, &fcache->configNames, @@ -686,7 +687,7 @@ fmgr_security_definer(PG_FUNCTION_ARGS) /* GetUserIdAndSecContext is cheap enough that no harm in a wasted call */ GetUserIdAndSecContext(&save_userid, &save_sec_context); - if (fcache->configNames != NIL) /* Need a new GUC nesting level */ + if (fcache->configNames != NIL) /* Need a new GUC nesting level */ save_nestlevel = NewGUCNestLevel(); else save_nestlevel = 0; /* keep compiler quiet */ @@ -697,11 +698,11 @@ fmgr_security_definer(PG_FUNCTION_ARGS) forboth(lc1, fcache->configNames, lc2, fcache->configValues) { - GucContext context = superuser() ? PGC_SUSET : PGC_USERSET; - GucSource source = PGC_S_SESSION; - GucAction action = GUC_ACTION_SAVE; - char *name = lfirst(lc1); - char *value = lfirst(lc2); + GucContext context = superuser() ? PGC_SUSET : PGC_USERSET; + GucSource source = PGC_S_SESSION; + GucAction action = GUC_ACTION_SAVE; + char *name = lfirst(lc1); + char *value = lfirst(lc2); (void) set_config_option(name, value, context, source, diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 3449470953a..99bb2fdd190 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -6280,16 +6280,16 @@ void ProcessGUCArray(ArrayType *array, GucContext context, GucSource source, GucAction action) { - List *gucNames; - List *gucValues; - ListCell *lc1; - ListCell *lc2; + List *gucNames; + List *gucValues; + ListCell *lc1; + ListCell *lc2; TransformGUCArray(array, &gucNames, &gucValues); forboth(lc1, gucNames, lc2, gucValues) { - char *name = lfirst(lc1); - char *value = lfirst(lc2); + char *name = lfirst(lc1); + char *value = lfirst(lc2); (void) set_config_option(name, value, context, source, |