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

LibGfx/JPEG: Don't fail to decode images with non-compliant ICC profile

Browse source 
Some images (like https://www.w3.org/Press/Stock/Berners-Lee/2001-europaeum-eighth.jpg)
embed a non-compliant ICC profile. Instead of rejecting the image, we
can simply discard the color profile and resume the decoding of the
bitmap.
This commit is contained in:
Lucas CHOLLET 2023-07-29 15:16:33 -04:00 • committed by Andreas Kling
parent 81df0278b1
commit 338d64abd9
1 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1044,6 +1044,9 @@ static ErrorOr<void> read_icc_profile(JPEGStream& stream, JPEGLoadingContext& co
context.icc_multi_chunk_state.emplace(ICCMultiChunkState { 0, TRY(FixedArray<ByteBuffer>::create(number_of_chunks)) }); context.icc_multi_chunk_state.emplace(ICCMultiChunkState { 0, TRY(FixedArray<ByteBuffer>::create(number_of_chunks)) });
auto& chunk_state = context.icc_multi_chunk_state; auto& chunk_state = context.icc_multi_chunk_state;
u8 index {};
auto const ensure_correctness = [&]() -> ErrorOr<void> {
if (chunk_state->seen_number_of_icc_chunks >= number_of_chunks) if (chunk_state->seen_number_of_icc_chunks >= number_of_chunks)
return Error::from_string_literal("Too many ICC chunks"); return Error::from_string_literal("Too many ICC chunks");
@ -1052,7 +1055,8 @@ static ErrorOr<void> read_icc_profile(JPEGStream& stream, JPEGLoadingContext& co
if (chunk_sequence_number == 0) if (chunk_sequence_number == 0)
return Error::from_string_literal("ICC chunk sequence number not 1 based"); return Error::from_string_literal("ICC chunk sequence number not 1 based");
u8 index = chunk_sequence_number - 1;
index = chunk_sequence_number - 1;
if (index >= chunk_state->chunks.size()) if (index >= chunk_state->chunks.size())
return Error::from_string_literal("ICC chunk sequence number larger than number of chunks"); return Error::from_string_literal("ICC chunk sequence number larger than number of chunks");
@ -1060,6 +1064,15 @@ static ErrorOr<void> read_icc_profile(JPEGStream& stream, JPEGLoadingContext& co
if (!chunk_state->chunks[index].is_empty()) if (!chunk_state->chunks[index].is_empty())
return Error::from_string_literal("Duplicate ICC chunk at sequence number"); return Error::from_string_literal("Duplicate ICC chunk at sequence number");
return {};
};
if (auto result = ensure_correctness(); result.is_error()) {
dbgln_if(JPEG_DEBUG, "JPEG: {}", result.release_error());
TRY(stream.discard(bytes_to_read));
return {};
}
chunk_state->chunks[index] = TRY(ByteBuffer::create_zeroed(bytes_to_read)); chunk_state->chunks[index] = TRY(ByteBuffer::create_zeroed(bytes_to_read));
TRY(stream.read_until_filled(chunk_state->chunks[index])); TRY(stream.read_until_filled(chunk_state->chunks[index]));