Commit 5dfd5063 authored by Tom Lane's avatar Tom Lane

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

since the person or script starting the postmaster has to be trusted
anyway.
parent 99b225c5
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* *
...@@ -450,8 +450,9 @@ PostmasterMain(int argc, char *argv[]) ...@@ -450,8 +450,9 @@ PostmasterMain(int argc, char *argv[])
/* /*
* Other options to pass to the backend on the command line * Other options to pass to the backend on the command line
*/ */
strcat(ExtraOptions, " "); snprintf(ExtraOptions + strlen(ExtraOptions),
strcat(ExtraOptions, optarg); sizeof(ExtraOptions) - strlen(ExtraOptions),
" %s", optarg);
break; break;
case 'p': case 'p':
SetConfigOption("port", optarg, PGC_POSTMASTER, PGC_S_ARGV); SetConfigOption("port", optarg, PGC_POSTMASTER, PGC_S_ARGV);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment