RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 19:38:12 +00:00
Code Issues Activity Actions

LibArchive: Pass along errors from Tar header checksum validation

Browse source
This commit is contained in:
Tim Schumacher 2022-11-28 19:11:30 +01:00 • committed by Andreas Kling
parent fd3a823a20
commit cb48b9bc30
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibArchive/TarStream.cpp
View file

@ -94,8 +94,8 @@ ErrorOr<void> TarInputStream::load_next_header()
if (header_span.size() != sizeof(m_header))
return Error::from_string_literal("Failed to read the entire header");
if (!valid())
return Error::from_string_literal("Header is not valid");
if (!TRY(valid()))
return Error::from_string_literal("Header has an invalid magic or checksum");
// Discard the rest of the header block.
TRY(m_stream->discard(block_size - sizeof(TarFileHeader)));
@ -103,7 +103,7 @@ ErrorOr<void> TarInputStream::load_next_header()
return {};
}
bool TarInputStream::valid() const
ErrorOr<bool> TarInputStream::valid() const
{
auto const header_magic = header().magic();
auto const header_version = header().version();
@ -114,10 +114,7 @@ bool TarInputStream::valid() const
return false;
// POSIX.1-1988 tar does not have magic numbers, so we also need to verify the header checksum.
if (header().checksum().is_error())
return false;
return header().checksum().release_value() == header().expected_checksum();
return TRY(header().checksum()) == header().expected_checksum();
}
TarFileStream TarInputStream::file_contents()