postgres.git / summary / log / commit / refs

commit    734478200ababcbb328ec3f02a74047bc470cae2
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Tue Aug 18 10:13:09 2020 +0000
First released in: 14.0, 12.5, 13.0

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


 src/bin/pg_basebackup/pg_basebackup.c | 2 +-
 src/bin/pg_checksums/pg_checksums.c   | 2 +-
 src/bin/pg_rewind/pg_rewind.c         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 8158c8e4195..7a5d4562f94 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -860,7 +860,7 @@ progress_report(int tablespacenum, const char *filename,
 	 * Stay on the same line if reporting to a terminal and we're not done
 	 * yet.
 	 */
-	fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
+	fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
 }
 
 static int32
diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
index 0696db69bbd..ffdc23945c6 100644
--- a/src/bin/pg_checksums/pg_checksums.c
+++ b/src/bin/pg_checksums/pg_checksums.c
@@ -166,7 +166,7 @@ progress_report(bool finished)
 	 * Stay on the same line if reporting to a terminal and we're not done
 	 * yet.
 	 */
-	fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
+	fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
 }
 
 static bool
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index a9aecc79052..23fc749e445 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -572,7 +572,7 @@ progress_report(bool finished)
 	 * Stay on the same line if reporting to a terminal and we're not done
 	 * yet.
 	 */
-	fprintf(stderr, (!finished && isatty(fileno(stderr))) ? "\r" : "\n");
+	fputc((!finished && isatty(fileno(stderr))) ? '\r' : '\n', stderr);
 }
 
 /*


[parent: 623a9ba79bbd]