summaryrefslogtreecommitdiff
path: root/src/bin/pg_combinebackup/reconstruct.c
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2024-01-11 13:06:10 -0500
committerRobert Haas <rhaas@postgresql.org>2024-01-11 13:06:10 -0500
commit3d5c332a3d6002c5c95cb238e2164ae054c8e805 (patch)
tree5308b9922e851faebec1d3f963d7d91c7f315da5 /src/bin/pg_combinebackup/reconstruct.c
parentee1bfd168390bc843c6704d16e909692c0a79f27 (diff)
Repair various defects in dc212340058b4e7ecfc5a7a81ec50e7a207bf288.
pg_combinebackup had various problems: * strncpy was used in various places where strlcpy should be used instead, to avoid any possibility of the result not being \0-terminated. * scan_for_existing_tablespaces() failed to close the directory, and an error when opening the directory was reported with the wrong pathname. * write_reconstructed_file() contained some redundant and therefore dead code. * flush_manifest() didn't check the result of pg_checksum_update() as we do in other places, and misused a local pathname variable that shouldn't exist at all. In pg_basebackup, the wrong variable name was used in one place, due to a copy and paste that was not properly adjusted. In blkreftable.c, the loop incorrectly doubled chunkno instead of max_chunks. Fix that. Also remove a nearby assertion per repeated off-list complaints from Tom Lane. Per Coverity and subsequent code inspection by me and by Tom Lane. Discussion: http://postgr.es/m/CA+Tgmobvqqj-DW9F7uUzT-cQqs6wcVb-Xhs=w=hzJnXSE-kRGw@mail.gmail.com
Diffstat (limited to 'src/bin/pg_combinebackup/reconstruct.c')
-rw-r--r--src/bin/pg_combinebackup/reconstruct.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/bin/pg_combinebackup/reconstruct.c b/src/bin/pg_combinebackup/reconstruct.c
index b835ec363e7..873d3079025 100644
--- a/src/bin/pg_combinebackup/reconstruct.c
+++ b/src/bin/pg_combinebackup/reconstruct.c
@@ -577,13 +577,12 @@ write_reconstructed_file(char *input_filename,
{
if (current_block == start_of_range)
appendStringInfo(&debug_buf, " %u:%s@" UINT64_FORMAT,
- current_block,
- s == NULL ? "ZERO" : s->filename,
+ current_block, s->filename,
(uint64) offsetmap[current_block]);
else
appendStringInfo(&debug_buf, " %u-%u:%s@" UINT64_FORMAT,
start_of_range, current_block,
- s == NULL ? "ZERO" : s->filename,
+ s->filename,
(uint64) offsetmap[current_block]);
}