From e4b0f86e1fe38147b0bcf6e50862d0899a31201c Mon Sep 17 00:00:00 2001 From: Fujii Masao Date: Thu, 17 Apr 2025 09:52:47 +0900 Subject: [PATCH] pg_dump: Fix incorrect archive format shown in error message. In pg_dump and pg_restore, _allocAH() calls _discoverArchiveFormat() to determine the archive format when the input format is unknown one. If the input or discovered format is unrecognized, it reports an error including the archive format number. If discovered format is unrecognized, its number should be shown in the error message. But previously the error message mistakenly showed the originally requested format number (i.e., unknown one) instead of the discovered one, due to referencing the wrong variable in the error message. This commit corrects the issue by using the appropriate variable in the error message. This fix has no practical impact since _discoverArchiveFormat() never returns an unrecognized format and that error mesasge is actually never output. Therefore, while the issue exists in back branches, it's not worth the trouble and buildfarm cycles to back-patch. So this fix is applied only to the master branch. Author: Mahendra Singh Thalor Reviewed-by: Tom Lane Reviewed-by: Fujii Masao Discussion: https://postgr.es/m/CAKYtNAqu+N-Ab2Fq6wzNSOm_-0N-BMneanYNV1+6kFDXjva1Eg@mail.gmail.com --- src/bin/pg_dump/pg_backup_archiver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index f961162f365..afa42337b11 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -2469,7 +2469,7 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt, break; default: - pg_fatal("unrecognized file format \"%d\"", fmt); + pg_fatal("unrecognized file format \"%d\"", AH->format); } return AH;