RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:07:45 +00:00
Code Issues Activity Actions

LibCompress: Factor out the list of XZ check sizes

Browse source
This commit is contained in:
Tim Schumacher 2023-04-01 11:15:42 +02:00 • committed by Andreas Kling
parent b451964bbc
commit 20f1a29202
1 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Userland/Libraries/LibCompress/Xz.cpp
View file

@ -175,6 +175,22 @@ XzDecompressor::XzDecompressor(NonnullOwnPtr<CountingStream> stream)
{ {
} }
static Optional<size_t> size_for_check_type(XzStreamCheckType check_type)
{
switch (check_type) {
case XzStreamCheckType::None:
return 0;
case XzStreamCheckType::CRC32:
return 4;
case XzStreamCheckType::CRC64:
return 8;
case XzStreamCheckType::SHA256:
return 32;
default:
return {};
}
}
ErrorOr<Bytes> XzDecompressor::read_some(Bytes bytes) ErrorOr<Bytes> XzDecompressor::read_some(Bytes bytes)
{ {
if (m_found_last_stream_footer) if (m_found_last_stream_footer)
@ -260,23 +276,14 @@ ErrorOr<Bytes> XzDecompressor::read_some(Bytes bytes)
// stored one, the decoder MUST indicate an error. If the selected // stored one, the decoder MUST indicate an error. If the selected
// type of Check is not supported by the decoder, it SHOULD // type of Check is not supported by the decoder, it SHOULD
// indicate a warning or error." // indicate a warning or error."
auto maybe_check_size = size_for_check_type(m_stream_flags->check_type);
if (!maybe_check_size.has_value())
return Error::from_string_literal("XZ stream has an unknown check type");
// TODO: Block content checks are currently unimplemented as a whole, independent of the check type. // TODO: Block content checks are currently unimplemented as a whole, independent of the check type.
// For now, we only make sure to remove the correct amount of bytes from the stream. // For now, we only make sure to remove the correct amount of bytes from the stream.
switch (m_stream_flags->check_type) { TRY(m_stream->discard(*maybe_check_size));
case XzStreamCheckType::None:
break;
case XzStreamCheckType::CRC32:
TRY(m_stream->discard(4));
break;
case XzStreamCheckType::CRC64:
TRY(m_stream->discard(8));
break;
case XzStreamCheckType::SHA256:
TRY(m_stream->discard(32));
break;
default:
return Error::from_string_literal("XZ stream has an unknown check type");
}
} }
auto start_of_current_block = m_stream->read_bytes(); auto start_of_current_block = m_stream->read_bytes();