RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:37:35 +00:00
Code Issues Activity Actions

LibCompress: Only require new LZMA2 properties after dictionary reset

Browse source
This commit is contained in:
Tim Schumacher 2023-03-29 03:18:00 +02:00 • committed by Andreas Kling
parent d9627503a9
commit 9ccb0fc1d8
2 changed files with 63 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibCompress/Lzma2.cpp
View file

@ -39,6 +39,10 @@ ErrorOr<Bytes> Lzma2Decompressor::read_some(Bytes bytes)
// " - 1 denotes a dictionary reset followed by an uncompressed chunk"
m_dictionary.clear();
m_dictionary_initialized = true;
// The XZ utils test files (bad-1-lzma2-8.xz) check that the decompressor
// requires a new set of properties after a dictionary reset.
m_last_lzma_options = {};
}
if (control_byte == 1 || control_byte == 2) {
@ -52,9 +56,6 @@ ErrorOr<Bytes> Lzma2Decompressor::read_some(Bytes bytes)
// - The data to be copied verbatim into the dictionary and the output"
u16 data_size = TRY(m_stream->read_value<BigEndian<u16>>()) + 1;
// The test files denote an LZMA chunk without its own settings following an uncompressed chunk as invalid.
m_last_lzma_options = {};
m_in_uncompressed_chunk = true;
m_current_chunk_stream = TRY(try_make<ConstrainedStream>(MaybeOwned { *m_stream }, data_size));
}