Fix off-by-1 bug in pg_ctl in -D handling, per report from pjmodos@parba.cz

Neil Conway · Neil Conway · commit b3f3092cadde · 2004-12-06T01:09:20.000Z
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-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.48 2004/11/27 18:51:05 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.49 2004/12/06 01:09:20 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1289,10 +1289,10 @@ main(int argc, char **argv)
 			{
 				case 'D':
 					{
-						char	   *pgdata_D = xmalloc(strlen(optarg));
+						char	   *pgdata_D;
 						char	   *env_var = xmalloc(strlen(optarg) + 8);
 
-						strcpy(pgdata_D, optarg);
+						pgdata_D = xstrdup(optarg);
 						canonicalize_path(pgdata_D);
 						snprintf(env_var, strlen(optarg) + 8, "PGDATA=%s",
 								 pgdata_D);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.48 2004/11/27 18:51:05 tgl Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.49 2004/12/06 01:09:20 neilc Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -1289,10 +1289,10 @@ main(int argc, char **argv)`
`1289`	`1289`	`{`
`1290`	`1290`	`case 'D':`
`1291`	`1291`	`{`
`1292`		`- char *pgdata_D = xmalloc(strlen(optarg));`
	`1292`	`+ char *pgdata_D;`
`1293`	`1293`	`char *env_var = xmalloc(strlen(optarg) + 8);`
`1294`	`1294`
`1295`		`- strcpy(pgdata_D, optarg);`
	`1295`	`+ pgdata_D = xstrdup(optarg);`
`1296`	`1296`	`canonicalize_path(pgdata_D);`
`1297`	`1297`	`snprintf(env_var, strlen(optarg) + 8, "PGDATA=%s",`
`1298`	`1298`	`pgdata_D);`