LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-08-15 08:20:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

AK+LibCompress: Break when seekback copying to a full CircularBuffer

Browse Source 
Otherwise, we just end up infinitely looping while waiting for more
space in the destination.
This commit is contained in:
Tim Schumacher 2023-04-04 18:43:24 +02:00 committed by Tim Flynn
parent 767fb01a8c
commit b88c58b94c
Notes: sideshowbarker 2024-07-16 21:55:16 +09:00 
Author: https://github.com/timschumi
Commit: https://github.com/SerenityOS/serenity/commit/b88c58b94c
Pull-request: https://github.com/SerenityOS/serenity/pull/18180
Reviewed-by: https://github.com/gmta
Reviewed-by: https://github.com/trflynn89 ✅
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AK/CircularBuffer.cpp
View File

@ -213,6 +213,9 @@ ErrorOr<size_t> CircularBuffer::copy_from_seekback(size_t distance, size_t lengt
auto remaining_length = length;
while (remaining_length > 0) {
if (empty_space() == 0)
break;
auto next_span = next_read_span_with_seekback(distance);
if (next_span.size() == 0)
break;

5
Userland/Libraries/LibCompress/Deflate.cpp
View File

@ -208,7 +208,10 @@ ErrorOr<bool> DeflateDecompressor::CompressedBlock::try_read_more()
m_decompressor.m_output_buffer.write({ &byte, sizeof(byte) });
}
} else {
TRY(m_decompressor.m_output_buffer.copy_from_seekback(distance, length));
auto copied_length = TRY(m_decompressor.m_output_buffer.copy_from_seekback(distance, length));
// TODO: What should we do if the output buffer is full?
VERIFY(copied_length == length);
}
return true;