db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-15 01:04:37 +02:00
Code Issues Releases Activity

Check that sha1 checksum is not empty in manifestFileUpdate().

Browse Source 
The manifest test module was setting a blank value here and causing a stack overflow because memcpy() is used instead of strcpy().

This was really just a test issue but add an assert just in case the same were to happen in production code.

Also update a bogus checksum in the integration tests to the correct length to avoid running afoul of the assert.

Found with -fsanitize=address.
This commit is contained in:
David Steele
2022-03-24 13:13:35 -06:00
parent 4e5ac11517
commit 14016a86e7
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/info/manifest.c
View File

@ -2820,7 +2820,10 @@ manifestFileUpdate(
// Update checksum if set
if (checksumSha1 != NULL)
{
ASSERT(strlen(checksumSha1) == HASH_TYPE_SHA1_SIZE_HEX);
memcpy(file.checksumSha1, checksumSha1, HASH_TYPE_SHA1_SIZE_HEX + 1);
}
// Update repo size
file.size = size;

3
test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm
View File

@ -784,7 +784,8 @@ sub run
$oHostBackup->manifestMunge(
basename($strResumePath),
{&MANIFEST_SECTION_TARGET_FILE =>
{(&MANIFEST_TARGET_PGDATA . '/badchecksum.txt') => {&MANIFEST_SUBKEY_CHECKSUM => BOGUS}}},
{(&MANIFEST_TARGET_PGDATA . '/badchecksum.txt') =>
{&MANIFEST_SUBKEY_CHECKSUM => 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'}}},
false);
}
# Change contents of resumed file without changing size so it will throw a nasty error about the repo having been corrupted

9
test/src/module/info/manifestTest.c
View File

@ -1747,9 +1747,12 @@ testRun(void)
"pg_data/special-@#!$^&*()_+~`{}[]\\:;", "find special file");
TEST_RESULT_BOOL(manifestFileExists(manifest, STRDEF("bogus")), false, "manifest file does not exist");
TEST_RESULT_VOID(
manifestFileUpdate(manifest, STRDEF("pg_data/postgresql.conf"), 4457, 4457, "", NULL, false, false, NULL, 0, 0),
"update file");
// Munge the sha1 checksum to be blank
ManifestFilePack **const fileMungePack = manifestFilePackFindInternal(manifest, STRDEF("pg_data/postgresql.conf"));
ManifestFile fileMunge = manifestFileUnpack(manifest, *fileMungePack);
fileMunge.checksumSha1[0] = '\0';
manifestFilePackUpdate(manifest, fileMungePack, &fileMunge);
TEST_RESULT_VOID(
manifestFileUpdate(
manifest, STRDEF("pg_data/postgresql.conf"), 4457, 4457, NULL, varNewStr(NULL), false, false, NULL, 0, 0),