Fix pg_ctl initdb without options.

ItGacky · ItGacky · commit 6f1bf75d50a5 · 2009-12-15T00:17:50.000Z
Passing NULL string to snprintf is avoided.
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -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 = "";
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.116 2009/12/10 06:32:28 petere Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.117 2009/12/15 00:17:50 itagaki Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -656,6 +656,9 @@ do_init(void)`
`656`	`656`	`if (exec_path == NULL)`
`657`	`657`	`exec_path = find_other_exec_or_die(argv0, "initdb", "initdb (PostgreSQL) " PG_VERSION "\n");`
`658`	`658`
	`659`	`+ if (pgdata_opt == NULL)`
	`660`	`+ pgdata_opt = "";`
	`661`	`+`
`659`	`662`	`if (post_opts == NULL)`
`660`	`663`	`post_opts = "";`
`661`	`664`