system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-02 06:04:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibGfx/JPEG2000: Check SIZ marker (w, h) against JP2 header (w, h)

Browse source
This commit is contained in:
Nico Weber 2024-04-18 19:44:22 -04:00 committed by Tim Flynn
parent f2e381ae19
commit 1a232ba2a6
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -801,6 +801,13 @@ static ErrorOr<void> decode_jpeg2000_header(JPEG2000LoadingContext& context, Rea
TRY(parse_codestream_main_header(context));
auto size_from_siz = IntSize { context.siz.width, context.siz.height };
if (size_from_siz != context.size) {
// FIXME: If this is common, warn and use size from SIZ marker.
dbgln("JPEG2000ImageDecoderPlugin: Image size from SIZ marker ({}) does not match image size from JP2 header ({})", size_from_siz, context.size);
return Error::from_string_literal("JPEG2000ImageDecoderPlugin: Image size from SIZ marker does not match image size from JP2 header");
}
return {};
}