Commit5dfd506

committed

Defend against overrun of ExtraOptions array --- strictly paranoia,

since the person or script starting the postmaster has to be trustedanyway.

1 parent99b225c commit5dfd506Copy full SHA for 5dfd506

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.405 2004/06/24 21:02:55 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.406 2004/07/10 23:29:16 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -450,8 +450,9 @@ PostmasterMain(int argc, char *argv[])`
`450`	`450`	`/*`
`451`	`451`	`* Other options to pass to the backend on the command line`
`452`	`452`	`*/`
`453`		`-strcat(ExtraOptions," ");`
`454`		`-strcat(ExtraOptions,optarg);`
	`453`	`+snprintf(ExtraOptions+strlen(ExtraOptions),`
	`454`	`+sizeof(ExtraOptions)-strlen(ExtraOptions),`
	`455`	`+" %s",optarg);`
`455`	`456`	`break;`
`456`	`457`	`case'p':`
`457`	`458`	`SetConfigOption("port",optarg,PGC_POSTMASTER,PGC_S_ARGV);`

Comments

(0)