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

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
index 5d908807b9d330542ff879c21bdb4403856d3fd8..ee934711ff74fb7e3492281ee09dfaf93b56bac4 100644 (file)
--- 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);