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 79e3b11da4daac8944c1eff6c24d854c03a4003d..7e5c3f59065342da9c6c81cfcf89e6eb9de5fdb0 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.61.2.1 2005/11/22 18:23:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.61.2.2 2006/01/14 16:16:08 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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)
        {