mirror of
https://github.com/postgres/postgres.git
synced 2025-12-21 05:21:08 +03:00
Repair various defects in dc21234005.
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
This commit is contained in:
@@ -988,8 +988,7 @@ BlockRefTableEntryMarkBlockModified(BlockRefTableEntry *entry,
|
||||
*/
|
||||
max_chunks = Max(16, entry->nchunks);
|
||||
while (max_chunks < chunkno + 1)
|
||||
chunkno *= 2;
|
||||
Assert(max_chunks > chunkno);
|
||||
max_chunks *= 2;
|
||||
extra_chunks = max_chunks - entry->nchunks;
|
||||
|
||||
if (entry->nchunks == 0)
|
||||
|
||||
Reference in New Issue
Block a user