Skip to content

P
Postgres FD Implementation
Commit 8eac3978 authored by Tom Lane's avatar Tom Lane
Browse files
Options

Get rid of unsafe sprintf and snprintf usages. Per compiler warnings.

parent adf6b8ed
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 11 deletions
contrib/pg_upgrade/controldata.c
View file @ 8eac3978
...@@ -62,10 +62,10 @@ get_control_data(migratorContext *ctx, ClusterInfo *cluster, bool live_check) ...@@ -62,10 +62,10 @@ get_control_data(migratorContext *ctx, ClusterInfo *cluster, bool live_check)
#else #else
SetEnvironmentVariableA("LANG", "C"); SetEnvironmentVariableA("LANG", "C");
#endif #endif
sprintf(cmd, SYSTEMQUOTE "\"%s/%s \"%s\"" SYSTEMQUOTE, snprintf(cmd, sizeof(cmd), SYSTEMQUOTE "\"%s/%s \"%s\"" SYSTEMQUOTE,
cluster->bindir, cluster->bindir,
live_check ? "pg_controldata\"" : "pg_resetxlog\" -n", live_check ? "pg_controldata\"" : "pg_resetxlog\" -n",
cluster->pgdata); cluster->pgdata);
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);
......
contrib/pg_upgrade/info.c
View file @ 8eac3978
...@@ -362,10 +362,10 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo, ...@@ -362,10 +362,10 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
curr->reloid = atol(PQgetvalue(res, relnum, i_oid)); curr->reloid = atol(PQgetvalue(res, relnum, i_oid));
nspname = PQgetvalue(res, relnum, i_nspname); nspname = PQgetvalue(res, relnum, i_nspname);
snprintf(curr->nspname, sizeof(curr->nspname), nspname); strlcpy(curr->nspname, nspname, sizeof(curr->nspname));
relname = PQgetvalue(res, relnum, i_relname); relname = PQgetvalue(res, relnum, i_relname);
snprintf(curr->relname, sizeof(curr->relname), relname); strlcpy(curr->relname, relname, sizeof(curr->relname));
curr->relfilenode = atol(PQgetvalue(res, relnum, i_relfilenode)); curr->relfilenode = atol(PQgetvalue(res, relnum, i_relfilenode));
curr->toastrelid = atol(PQgetvalue(res, relnum, i_reltoastrelid)); curr->toastrelid = atol(PQgetvalue(res, relnum, i_reltoastrelid));
...@@ -374,7 +374,7 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo, ...@@ -374,7 +374,7 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
/* if no table tablespace, use the database tablespace */ /* if no table tablespace, use the database tablespace */
if (strlen(tblspace) == 0) if (strlen(tblspace) == 0)
tblspace = dbinfo->db_tblspace; tblspace = dbinfo->db_tblspace;
snprintf(curr->tablespace, sizeof(curr->tablespace), "%s", tblspace); strlcpy(curr->tablespace, tblspace, sizeof(curr->tablespace));
} }
PQclear(res); PQclear(res);
......
contrib/pg_upgrade/server.c
View file @ 8eac3978
...@@ -178,10 +178,11 @@ start_postmaster(migratorContext *ctx, Cluster whichCluster, bool quiet) ...@@ -178,10 +178,11 @@ start_postmaster(migratorContext *ctx, Cluster whichCluster, bool quiet)
} }
/* use -l for Win32 */ /* use -l for Win32 */
sprintf(cmd, SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" " snprintf(cmd, sizeof(cmd),
"-o \"-p %d -c autovacuum=off -c autovacuum_freeze_max_age=2000000000\" " SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" "
"start >> \"%s\" 2>&1" SYSTEMQUOTE, "-o \"-p %d -c autovacuum=off -c autovacuum_freeze_max_age=2000000000\" "
bindir, ctx->logfile, datadir, port, ctx->logfile); "start >> \"%s\" 2>&1" SYSTEMQUOTE,
bindir, ctx->logfile, datadir, port, ctx->logfile);
exec_prog(ctx, true, "%s", cmd); exec_prog(ctx, true, "%s", cmd);
/* wait for the server to start properly */ /* wait for the server to start properly */
......
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