beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibGfx: Pad last element in ICC files to 4-byte boundary too

Browse source 
The spec wants that to happen.
This commit is contained in:
Nico Weber 2023-02-23 09:10:26 -05:00 committed by Andreas Kling
parent 7853be7869
commit e8bd067ce5
Notes: sideshowbarker 2024-07-17 04:41:05 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/e8bd067ce5
Pull-request: https://github.com/SerenityOS/serenity/pull/17580
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibGfx/ICC/BinaryWriter.cpp
View file

@ -717,10 +717,13 @@ ErrorOr<ByteBuffer> encode(Profile const& profile)
offset += align_up_to(bytes.size(), 4);
}
// Omit padding after last element.
size_t total_size = offsets.last() + tag_data_bytes.last().size();
auto bytes = TRY(ByteBuffer::create_zeroed(total_size));
// Include padding after last element. Use create_zeroed() to fill padding bytes with null bytes.
// ICC v4, 7.1.2:
// "c) all tagged element data, including the last, shall be padded by no more than three following pad bytes to
// reach a 4-byte boundary;
// d) all pad bytes shall be NULL (as defined in ISO/IEC 646, character 0/0).
// NOTE 1 This implies that the length is required to be a multiple of four."
auto bytes = TRY(ByteBuffer::create_zeroed(offset));
for (size_t i = 0; i < tag_data_bytes.size(); ++i)
memcpy(bytes.data() + offsets[i], tag_data_bytes[i].data(), tag_data_bytes[i].size());