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

ImageDecoder: Fix assertion after failed decode

Browse source 
We were calling value() on an ErrorOr containing an error when trying
to extract the frame duration after a failed decode.

This fixes ImageDecoder crashing on various websites.
This commit is contained in:
Andreas Kling 2021-11-29 13:10:07 +01:00
parent dcc7d7d566
commit da42c1552c
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Services/ImageDecoder/ClientConnection.cpp
View file

@ -53,11 +53,14 @@ Messages::ImageDecoderServer::DecodeImageResponse ClientConnection::decode_image
Vector<u32> durations; Vector<u32> durations;
for (size_t i = 0; i < decoder->frame_count(); ++i) { for (size_t i = 0; i < decoder->frame_count(); ++i) {
auto frame_or_error = decoder->frame(i); auto frame_or_error = decoder->frame(i);
if (frame_or_error.is_error() || !frame_or_error.value().image) if (frame_or_error.is_error()) {
bitmaps.append(Gfx::ShareableBitmap {}); bitmaps.append(Gfx::ShareableBitmap {});
else durations.append(0);
bitmaps.append(frame_or_error.value().image->to_shareable_bitmap()); } else {
durations.append(frame_or_error.value().duration); auto frame = frame_or_error.release_value();
bitmaps.append(frame.image->to_shareable_bitmap());
durations.append(frame.duration);
}
} }
return { decoder->is_animated(), static_cast<u32>(decoder->loop_count()), bitmaps, durations }; return { decoder->is_animated(), static_cast<u32>(decoder->loop_count()), bitmaps, durations };