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

LibCompress: Switch DeflateDecompressor to a fallible constructor

Browse source 
We don't have anything fallible in there yet, but we will soon switch
the seekback buffer to the new `CircularBuffer`, which has a fallible
constructor.

We have to do the same for the internal `GzipDecompressor::Member`
class, as it needs to construct a `DeflateCompressor` from its received
stream.
This commit is contained in:
Tim Schumacher 2023-01-01 00:38:05 +01:00 • committed by Andrew Kaster
parent d717a08003
commit d23f0a7405
4 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibCompress/Gzip.cpp
View file

@ -39,6 +39,18 @@ bool BlockHeader::supported_by_implementation() const
return true;
}
ErrorOr<NonnullOwnPtr<GzipDecompressor::Member>> GzipDecompressor::Member::construct(BlockHeader header, Core::Stream::Stream& stream)
{
auto deflate_stream = TRY(DeflateDecompressor::construct(Core::Stream::Handle<Core::Stream::Stream>(stream)));
return TRY(adopt_nonnull_own_or_enomem(new (nothrow) Member(header, move(deflate_stream))));
}
GzipDecompressor::Member::Member(BlockHeader header, NonnullOwnPtr<DeflateDecompressor> stream)
: m_header(header)
, m_stream(move(stream))
{
}
GzipDecompressor::GzipDecompressor(NonnullOwnPtr<Core::Stream::Stream> stream)
: m_input_stream(move(stream))
{
@ -58,8 +70,8 @@ ErrorOr<Bytes> GzipDecompressor::read(Bytes bytes)
auto slice = bytes.slice(total_read);
if (m_current_member.has_value()) {
auto current_slice = TRY(current_member().m_stream.read(slice));
if (m_current_member) {
auto current_slice = TRY(current_member().m_stream->read(slice));
current_member().m_checksum.update(current_slice);
current_member().m_nread += current_slice.size();
@ -131,7 +143,7 @@ ErrorOr<Bytes> GzipDecompressor::read(Bytes bytes)
// FIXME: we should probably verify this instead of just assuming it matches
}
m_current_member.emplace(header, *m_input_stream);
m_current_member = TRY(Member::construct(header, *m_input_stream));
continue;
}
}