summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-06-16 12:17:03 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2016-06-16 12:17:16 -0400
commite542bfe61d3a9f96c4ffb8d2046fe31eb86fcd07 (patch)
treec384eeadbc87138f3583c0ba65001107b205695a
parent01384f7bd55f220107eca5f96986aaf98ec061af (diff)
Avoid crash in "postgres -C guc" for a GUC with a null string value.
Emit "(null)" instead, which was the behavior all along on platforms that don't crash, eg OS X. Per report from Jehan-Guillaume de Rorthais. Back-patch to 9.2 where -C option was introduced. Michael Paquier Report: <20160615204036.2d35d86a@firost>
-rw-r--r--src/backend/postmaster/postmaster.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index c6a8305274d..b562ea75be3 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -816,10 +816,14 @@ PostmasterMain(int argc, char *argv[])
if (output_config_variable != NULL)
{
/*
- * permission is handled because the user is reading inside the data
- * dir
+ * "-C guc" was specified, so print GUC's value and exit. No extra
+ * permission check is needed because the user is reading inside the
+ * data dir.
*/
- puts(GetConfigOption(output_config_variable, false, false));
+ const char *config_val = GetConfigOption(output_config_variable,
+ false, false);
+
+ puts(config_val ? config_val : "(null)");
ExitPostmaster(0);
}