Commitaecefff

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 parent4f47c8e commitaecefffCopy full SHA for aecefff

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ progress_report(bool finished)`
`505`	`505`	`* Stay on the same line if reporting to a terminal and we're not done`
`506`	`506`	`* yet.`
`507`	`507`	`*/`
`508`		`-fprintf(stderr,(!finished&&isatty(fileno(stderr))) ?"\r" :"\n");`
	`508`	`+fputc((!finished&&isatty(fileno(stderr))) ?'\r' :'\n',stderr);`
`509`	`509`	`}`
`510`	`510`
`511`	`511`	`/*`

Comments

(0)