Commit7344782

committed

Avoid non-constant format string argument to fprintf().

As Tom Lane pointed out, it could defeat the compiler's printf() formatstring verification.Backpatch to v12, like that patch that introduced it.Discussion:https://www.postgresql.org/message-id/1069283.1597672779%40sss.pgh.pa.us

1 parent623a9ba commit7344782Copy full SHA for 7344782

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,7 @@ progress_report(int tablespacenum, const char *filename,`
`860`	`860`	`* Stay on the same line if reporting to a terminal and we're not done`
`861`	`861`	`* yet.`
`862`	`862`	`*/`
`863`		`-fprintf(stderr,(!finished&&isatty(fileno(stderr))) ?"\r" :"\n");`
	`863`	`+fputc((!finished&&isatty(fileno(stderr))) ?'\r' :'\n',stderr);`
`864`	`864`	`}`
`865`	`865`
`866`	`866`	`staticint32`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ progress_report(bool finished)`
`166`	`166`	`* Stay on the same line if reporting to a terminal and we're not done`
`167`	`167`	`* yet.`
`168`	`168`	`*/`
`169`		`-fprintf(stderr,(!finished&&isatty(fileno(stderr))) ?"\r" :"\n");`
	`169`	`+fputc((!finished&&isatty(fileno(stderr))) ?'\r' :'\n',stderr);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`staticbool`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ progress_report(bool finished)`
`572`	`572`	`* Stay on the same line if reporting to a terminal and we're not done`
`573`	`573`	`* yet.`
`574`	`574`	`*/`
`575`		`-fprintf(stderr,(!finished&&isatty(fileno(stderr))) ?"\r" :"\n");`
	`575`	`+fputc((!finished&&isatty(fileno(stderr))) ?'\r' :'\n',stderr);`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`/*`

Comments

(0)