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

LibGfx/WebP: Check ICCP chunk precedes alpha and animation frame chunks

Browse source
This commit is contained in:
Nico Weber 2023-05-05 20:09:47 -04:00 • committed by Andreas Kling
parent 41d518669e
commit 03b04ed66a
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp
View file

@ -1454,9 +1454,12 @@ static ErrorOr<void> decode_webp_extended(WebPLoadingContext& context, ReadonlyB
// https://developers.google.com/speed/webp/docs/riff_container#color_profile
// "This chunk MUST appear before the image data."
// FIXME: Doesn't check animated files.
if (context.iccp_chunk.has_value() && context.image_data_chunk.has_value() && context.iccp_chunk->data.data() > context.image_data_chunk->data.data())
if (context.iccp_chunk.has_value()
&& ((context.image_data_chunk.has_value() && context.iccp_chunk->data.data() > context.image_data_chunk->data.data())
|| (context.alpha_chunk.has_value() && context.iccp_chunk->data.data() > context.alpha_chunk->data.data())
|| (!context.animation_frame_chunks.is_empty() && context.iccp_chunk->data.data() > context.animation_frame_chunks[0].data.data()))) {
return context.error("WebPImageDecoderPlugin: ICCP chunk is after image data");
}
context.state = WebPLoadingContext::State::ChunksDecoded;
return {};