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

Just paranoia ...

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index ed78587a49c622aec6d2a456f25489ada9725f4e..b5379ae0e79ddbb6e4768c50001ea1fc859f3d7f 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.45 2004/11/04 22:25:12 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.46 2004/11/17 16:34:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1284,7 +1284,7 @@ main(int argc, char **argv)
 
                                                strcpy(pgdata_D, optarg);
                                                canonicalize_path(pgdata_D);
-                                               snprintf(env_var, strlen(pgdata_D) + 8, "PGDATA=%s",
+                                               snprintf(env_var, strlen(optarg) + 8, "PGDATA=%s",
                                                                 pgdata_D);
                                                putenv(env_var);
 
@@ -1294,7 +1294,8 @@ main(int argc, char **argv)
                                                 *      postmaster 'ps' display
                                                 */
                                                pgdata_opt = xmalloc(strlen(pgdata_D) + 7);
-                                               snprintf(pgdata_opt, strlen(pgdata_D) + 7, "-D \"%s\" ",
+                                               snprintf(pgdata_opt, strlen(pgdata_D) + 7,
+                                                                "-D \"%s\" ",
                                                                 pgdata_D);
                                                break;
                                        }