postgres.git / summary / log / commit / refs

commit    a914a0414232e30943f7b2ffd997d74bd018a7b1
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Fri Feb 19 01:12:38 2016 +0000

    pg_dump: Fix inconsistent sscanf() conversions
    
    It was using %u to read a string that was earlier produced by snprintf with %d
    into a signed integer variable.  This seems to work in practice but is
    incorrect.
    
    found by cppcheck


 src/bin/pg_dump/pg_backup_custom.c    | 2 +-
 src/bin/pg_dump/pg_backup_directory.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index be6dbca0566..66329dc90c2 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -871,7 +871,7 @@ _MasterEndParallelItem(ArchiveHandle *AH, TocEntry *te, const char *str, T_Actio
 	/* no parallel dump in the custom archive */
 	Assert(act == ACT_RESTORE);
 
-	sscanf(str, "%u %u %u%n", &dumpId, &status, &n_errors, &nBytes);
+	sscanf(str, "%d %d %d%n", &dumpId, &status, &n_errors, &nBytes);
 
 	Assert(nBytes == strlen(str));
 	Assert(dumpId == te->dumpId);
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index 727a7fe06fb..1d7b0cc66ad 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -859,14 +859,14 @@ _MasterEndParallelItem(ArchiveHandle *AH, TocEntry *te, const char *str, T_Actio
 
 	if (act == ACT_DUMP)
 	{
-		sscanf(str, "%u%n", &dumpId, &nBytes);
+		sscanf(str, "%d%n", &dumpId, &nBytes);
 
 		Assert(dumpId == te->dumpId);
 		Assert(nBytes == strlen(str));
 	}
 	else if (act == ACT_RESTORE)
 	{
-		sscanf(str, "%u %u %u%n", &dumpId, &status, &n_errors, &nBytes);
+		sscanf(str, "%d %d %d%n", &dumpId, &status, &n_errors, &nBytes);
 
 		Assert(dumpId == te->dumpId);
 		Assert(nBytes == strlen(str));


[parent: 19a541143a09]