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 9ac22e28b222c151237b9c65f5bf0f7452d9850e..5aa96f8865fe7b1edf1930dc6c36e8ce9ab4b98e 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.53.4.2 2005/05/04 22:35:22 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.53.4.3 2006/01/14 16:18:30 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1518,10 +1518,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)
    {