Fix pg_ctl crash on "unregister" when a data directory is not specified.

by Magnus Hagander

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 33b5ce53a21f7b4b453c01953518593a251a173d..39f9be98bed035c2ba4998b77caa060ba4f17511 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -1521,10 +1521,13 @@ main(int argc, char **argv)
                do_wait = false;
        }
 
-       snprintf(def_postopts_file, MAXPGPATH, "%s/postmaster.opts.default", pg_data);
-       snprintf(postopts_file, MAXPGPATH, "%s/postmaster.opts", pg_data);
-       snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", pg_data);
-       snprintf(conf_file, MAXPGPATH, "%s/postgresql.conf", pg_data);
+       if (pg_data != NULL)
+       {
+               snprintf(def_postopts_file, MAXPGPATH, "%s/postmaster.opts.default", pg_data);
+               snprintf(postopts_file, MAXPGPATH, "%s/postmaster.opts", pg_data);
+               snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", pg_data);
+               snprintf(conf_file, MAXPGPATH, "%s/postgresql.conf", pg_data);
+       }
 
        switch (ctl_command)
        {