Commit18b5835

committed

Be sure length limit passed to snprintf matches what malloc was given.

Just paranoia ...

1 parent37d6930 commit18b5835Copy full SHA for 18b5835

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

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.45 2004/11/04 22:25:12 momjian Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.46 2004/11/17 16:34:42 tgl Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -1284,7 +1284,7 @@ main(int argc, char **argv)`
`1284`	`1284`
`1285`	`1285`	`strcpy(pgdata_D,optarg);`
`1286`	`1286`	`canonicalize_path(pgdata_D);`
`1287`		`-snprintf(env_var,strlen(pgdata_D)+8,"PGDATA=%s",`
	`1287`	`+snprintf(env_var,strlen(optarg)+8,"PGDATA=%s",`
`1288`	`1288`	`pgdata_D);`
`1289`	`1289`	`putenv(env_var);`
`1290`	`1290`
`@@ -1294,7 +1294,8 @@ main(int argc, char **argv)`
`1294`	`1294`	`*postmaster 'ps' display`
`1295`	`1295`	`*/`
`1296`	`1296`	`pgdata_opt=xmalloc(strlen(pgdata_D)+7);`
`1297`		`-snprintf(pgdata_opt,strlen(pgdata_D)+7,"-D \"%s\" ",`
	`1297`	`+snprintf(pgdata_opt,strlen(pgdata_D)+7,`
	`1298`	`+"-D \"%s\" ",`
`1298`	`1299`	`pgdata_D);`
`1299`	`1300`	`break;`
`1300`	`1301`	`}`

Comments

(0)