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

Streams: Distinguish recoverable and fatal errors.

Browse source
This commit is contained in:
asynts 2020-08-31 13:12:15 +02:00 • committed by Andreas Kling
parent daeb2bdc60
commit 9ce4475907
9 changed files with 75 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Libraries/LibCompress/Deflate.cpp
View file

@ -204,7 +204,7 @@ size_t DeflateDecompressor::read(Bytes bytes)
m_input_stream >> length >> negated_length;
if ((length ^ 0xffff) != negated_length) {
m_error = true;
set_fatal_error();
return 0;
}
@ -273,7 +273,7 @@ size_t DeflateDecompressor::read(Bytes bytes)
bool DeflateDecompressor::read_or_error(Bytes bytes)
{
if (read(bytes) < bytes.size()) {
m_error = true;
set_fatal_error();
return false;
}
@ -287,7 +287,7 @@ bool DeflateDecompressor::discard_or_error(size_t count)
size_t ndiscarded = 0;
while (ndiscarded < count) {
if (eof()) {
m_error = true;
set_fatal_error();
return false;
}
@ -371,7 +371,7 @@ void DeflateDecompressor::decode_codes(CanonicalCode& literal_code, Optional<Can
auto code_length_code_result = CanonicalCode::from_bytes({ code_lengths_code_lengths, sizeof(code_lengths_code_lengths) });
if (!code_length_code_result.has_value()) {
m_error = true;
set_fatal_error();
return;
}
const auto code_length_code = code_length_code_result.value();
@ -399,7 +399,7 @@ void DeflateDecompressor::decode_codes(CanonicalCode& literal_code, Optional<Can
ASSERT(symbol == 16);
if (code_lengths.is_empty()) {
m_error = true;
set_fatal_error();
return;
}
@ -410,7 +410,7 @@ void DeflateDecompressor::decode_codes(CanonicalCode& literal_code, Optional<Can
}
if (code_lengths.size() != literal_code_count + distance_code_count) {
m_error = true;
set_fatal_error();
return;
}
@ -418,7 +418,7 @@ void DeflateDecompressor::decode_codes(CanonicalCode& literal_code, Optional<Can
auto literal_code_result = CanonicalCode::from_bytes(code_lengths.span().trim(literal_code_count));
if (!literal_code_result.has_value()) {
m_error = true;
set_fatal_error();
return;
}
literal_code = literal_code_result.value();
@ -431,14 +431,14 @@ void DeflateDecompressor::decode_codes(CanonicalCode& literal_code, Optional<Can
if (length == 0) {
return;
} else if (length != 1) {
m_error = true;
set_fatal_error();
return;
}
}
auto distance_code_result = CanonicalCode::from_bytes(code_lengths.span().slice(literal_code_count));
if (!distance_code_result.has_value()) {
m_error = true;
set_fatal_error();
return;
}
distance_code = distance_code_result.value();

10
Libraries/LibCompress/Gzip.cpp
View file

@ -77,12 +77,12 @@ size_t GzipDecompressor::read(Bytes bytes)
m_input_stream >> crc32 >> input_size;
if (crc32 != current_member().m_checksum.digest()) {
m_error = true;
set_fatal_error();
return 0;
}
if (input_size != current_member().m_nread) {
m_error = true;
set_fatal_error();
return 0;
}
@ -101,7 +101,7 @@ size_t GzipDecompressor::read(Bytes bytes)
m_input_stream >> Bytes { &header, sizeof(header) };
if (!header.valid_magic_number() || !header.supported_by_implementation()) {
m_error = true;
set_fatal_error();
return 0;
}
@ -129,7 +129,7 @@ size_t GzipDecompressor::read(Bytes bytes)
bool GzipDecompressor::read_or_error(Bytes bytes)
{
if (read(bytes) < bytes.size()) {
m_error = true;
set_fatal_error();
return false;
}
@ -143,7 +143,7 @@ bool GzipDecompressor::discard_or_error(size_t count)
size_t ndiscarded = 0;
while (ndiscarded < count) {
if (eof()) {
m_error = true;
set_fatal_error();
return false;
}