Merge pull request #33 from dalibo/test_GetConfigOption

add NULL test on GetConfigOption()
dalibo · Jun 30, 2023 · 865cf0a · 865cf0a
2 parents 455c642 + ae9b665
commit 865cf0a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/pg_query_settings.c b/pg_query_settings.c
@@ -157,6 +157,7 @@ execPlantuner(Query *parse, const char *query_st, int cursorOptions, ParamListIn
  int64 id;
  char *guc_value = NULL;
  char *guc_name = NULL;
+ const char *oldValue = NULL;
  parameter *param = NULL;
  uint64 queryid = 0;
 
@@ -213,7 +214,13 @@ execPlantuner(Query *parse, const char *query_st, int cursorOptions, ParamListIn
  param->name = pstrdup(guc_name);
 
  /* Get and store current value for the parameter. */
- param->oldValue = pstrdup(GetConfigOption(guc_name, true, false));
+ oldValue = GetConfigOption(guc_name, true, false);
+ if (oldValue == NULL)
+ {
+ elog(WARNING, "Parameter %s does not exists", guc_name);
+ continue;
+ }
+ param->oldValue = pstrdup(oldValue);
 
  slist_push_head(&paramResetList, &param->node);