Commit8eac397

committed

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

1 parentadf6b8e commit8eac397Copy full SHA for 8eac397

File tree

+12

-11

lines changed

+12

-11

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,10 @@ get_control_data(migratorContext ctx, ClusterInfo cluster, bool live_check)`
`62`	`62`	`#else`
`63`	`63`	`SetEnvironmentVariableA("LANG","C");`
`64`	`64`	`#endif`
`65`		`-sprintf(cmd,SYSTEMQUOTE"\"%s/%s \"%s\""SYSTEMQUOTE,`
`66`		`-cluster->bindir,`
`67`		`-live_check ?"pg_controldata\"" :"pg_resetxlog\" -n",`
`68`		`-cluster->pgdata);`
	`65`	`+snprintf(cmd,sizeof(cmd),SYSTEMQUOTE"\"%s/%s \"%s\""SYSTEMQUOTE,`
	`66`	`+cluster->bindir,`
	`67`	`+live_check ?"pg_controldata\"" :"pg_resetxlog\" -n",`
	`68`	`+cluster->pgdata);`
`69`	`69`	`fflush(stdout);`
`70`	`70`	`fflush(stderr);`
`71`	`71`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -362,10 +362,10 @@ get_rel_infos(migratorContext ctx, const DbInfo dbinfo,`
`362`	`362`	`curr->reloid=atol(PQgetvalue(res,relnum,i_oid));`
`363`	`363`
`364`	`364`	`nspname=PQgetvalue(res,relnum,i_nspname);`
`365`		`-snprintf(curr->nspname,sizeof(curr->nspname),nspname);`
	`365`	`+strlcpy(curr->nspname,nspname,sizeof(curr->nspname));`
`366`	`366`
`367`	`367`	`relname=PQgetvalue(res,relnum,i_relname);`
`368`		`-snprintf(curr->relname,sizeof(curr->relname),relname);`
	`368`	`+strlcpy(curr->relname,relname,sizeof(curr->relname));`
`369`	`369`
`370`	`370`	`curr->relfilenode=atol(PQgetvalue(res,relnum,i_relfilenode));`
`371`	`371`	`curr->toastrelid=atol(PQgetvalue(res,relnum,i_reltoastrelid));`
`@@ -374,7 +374,7 @@ get_rel_infos(migratorContext ctx, const DbInfo dbinfo,`
`374`	`374`	`/* if no table tablespace, use the database tablespace */`
`375`	`375`	`if (strlen(tblspace)==0)`
`376`	`376`	`tblspace=dbinfo->db_tblspace;`
`377`		`-snprintf(curr->tablespace,sizeof(curr->tablespace),"%s",tblspace);`
	`377`	`+strlcpy(curr->tablespace,tblspace,sizeof(curr->tablespace));`
`378`	`378`	`}`
`379`	`379`	`PQclear(res);`
`380`	`380`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,10 +178,11 @@ start_postmaster(migratorContext *ctx, Cluster whichCluster, bool quiet)`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`/* use -l for Win32 */`
`181`		`-sprintf(cmd,SYSTEMQUOTE"\"%s/pg_ctl\" -l \"%s\" -D \"%s\" "`
`182`		`-"-o \"-p %d -c autovacuum=off -c autovacuum_freeze_max_age=2000000000\" "`
`183`		`-"start >> \"%s\" 2>&1"SYSTEMQUOTE,`
`184`		`-bindir,ctx->logfile,datadir,port,ctx->logfile);`
	`181`	`+snprintf(cmd,sizeof(cmd),`
	`182`	`+SYSTEMQUOTE"\"%s/pg_ctl\" -l \"%s\" -D \"%s\" "`
	`183`	`+"-o \"-p %d -c autovacuum=off -c autovacuum_freeze_max_age=2000000000\" "`
	`184`	`+"start >> \"%s\" 2>&1"SYSTEMQUOTE,`
	`185`	`+bindir,ctx->logfile,datadir,port,ctx->logfile);`
`185`	`186`	`exec_prog(ctx, true,"%s",cmd);`
`186`	`187`
`187`	`188`	`/* wait for the server to start properly */`

Comments

(0)