Commit 18b58350 authored by Tom Lane's avatar Tom Lane

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

Just paranoia ...
parent 37d69303
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* *
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * 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) ...@@ -1284,7 +1284,7 @@ main(int argc, char **argv)
strcpy(pgdata_D, optarg); strcpy(pgdata_D, optarg);
canonicalize_path(pgdata_D); canonicalize_path(pgdata_D);
snprintf(env_var, strlen(pgdata_D) + 8, "PGDATA=%s", snprintf(env_var, strlen(optarg) + 8, "PGDATA=%s",
pgdata_D); pgdata_D);
putenv(env_var); putenv(env_var);
...@@ -1294,7 +1294,8 @@ main(int argc, char **argv) ...@@ -1294,7 +1294,8 @@ main(int argc, char **argv)
* postmaster 'ps' display * postmaster 'ps' display
*/ */
pgdata_opt = xmalloc(strlen(pgdata_D) + 7); 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); pgdata_D);
break; break;
} }
......
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