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

LibGfx/JPEG: Keep the original CMYK data in memory

Browse source 
When decoding a CMYK image and asked for a normal `frame()`, the decoder
would convert the CMYK bitmap into an RGB bitmap. Calling `cmyk_frame()`
after that point will provoke a null-dereference.
This commit is contained in:
Lucas CHOLLET 2024-01-18 17:03:36 -05:00 • committed by Andrew Kaster
parent 980b61470c
commit 0462858247
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp
View file

@ -1709,7 +1709,6 @@ static ErrorOr<void> cmyk_to_rgb(JPEGLoadingContext& context)
} }
} }
context.cmyk_bitmap = nullptr;
return {}; return {};
} }
@ -2026,7 +2025,7 @@ ErrorOr<ImageFrameDescriptor> JPEGImageDecoderPlugin::frame(size_t index, Option
m_context->state = JPEGLoadingContext::State::BitmapDecoded; m_context->state = JPEGLoadingContext::State::BitmapDecoded;
} }
if (m_context->cmyk_bitmap) if (m_context->cmyk_bitmap && !m_context->bitmap)
TRY(cmyk_to_rgb(*m_context)); TRY(cmyk_to_rgb(*m_context));
return ImageFrameDescriptor { m_context->bitmap, 0 }; return ImageFrameDescriptor { m_context->bitmap, 0 };