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

tglsfdc · tglsfdc · commit 5dfd5063e242 · 2004-07-10T23:29:16.000Z
since the person or script starting the postmaster has to be trusted
anyway.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.405 2004/06/24 21:02:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.406 2004/07/10 23:29:16 tgl Exp $
  *
  * NOTES
  *
@@ -450,8 +450,9 @@ PostmasterMain(int argc, char *argv[])
 				/*
 				 * Other options to pass to the backend on the command line
 				 */
-				strcat(ExtraOptions, " ");
-				strcat(ExtraOptions, optarg);
+				snprintf(ExtraOptions + strlen(ExtraOptions),
+						 sizeof(ExtraOptions) - strlen(ExtraOptions),
+						 " %s", optarg);
 				break;
 			case 'p':
 				SetConfigOption("port", optarg, PGC_POSTMASTER, PGC_S_ARGV);

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);`