OSDN Git Service

Fix pg_ctl initdb without options.
authorItagaki Takahiro <itagaki.takahiro@gmail.com>
Tue, 15 Dec 2009 00:17:50 +0000 (00:17 +0000)
committerItagaki Takahiro <itagaki.takahiro@gmail.com>
Tue, 15 Dec 2009 00:17:50 +0000 (00:17 +0000)
Passing NULL string to snprintf is avoided.

src/bin/pg_ctl/pg_ctl.c

index 1e874a7..03de395 100644 (file)
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.116 2009/12/10 06:32:28 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.117 2009/12/15 00:17:50 itagaki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -656,6 +656,9 @@ do_init(void)
        if (exec_path == NULL)
                exec_path = find_other_exec_or_die(argv0, "initdb", "initdb (PostgreSQL) " PG_VERSION "\n");
 
+       if (pgdata_opt == NULL)
+               pgdata_opt = "";
+
        if (post_opts == NULL)
                post_opts = "";