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

LibGfx/ICC+icc: Be lenient about invalid profile creation datetimes

Browse source 
Before, we used to reject profiles where the creation datetime was
invalid per spec. But invalid dates happen in practice (most commonly,
all fields set to 0). They don't affect profile conversion at all,
so be lenient about this, in exchange for slightly more wordy code
in the places that want to show the creation datetime.

Fixes a crash rendering page 2 of
https://fredrikbk.com/publications/copy-and-patch.pdf
This commit is contained in:
Nico Weber 2024-02-20 10:22:44 -05:00 • committed by Andreas Kling
parent 3b7c252175
commit 0160f737e2
5 changed files with 114 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibGfx/ICC/Profile.h
View file

@ -130,6 +130,22 @@ private:
u64 m_bits = 0;
};
// Time is in UTC.
// Per spec, month is 1-12, day is 1-31, hours is 0-23, minutes 0-59, seconds 0-59 (i.e. no leap seconds).
// But in practice, some profiles have invalid dates, like 0-0-0 0:0:0.
// For valid profiles, the conversion to time_t will succeed.
struct DateTime {
u16 year = 1970;
u16 month = 1; // One-based.
u16 day = 1; // One-based.
u16 hours = 0;
u16 minutes = 0;
u16 seconds = 0;
ErrorOr<time_t> to_time_t() const;
static ErrorOr<DateTime> from_time_t(time_t);
};
struct ProfileHeader {
u32 on_disk_size { 0 };
Optional<PreferredCMMType> preferred_cmm_type;
@ -137,7 +153,7 @@ struct ProfileHeader {
DeviceClass device_class {};
ColorSpace data_color_space {};
ColorSpace connection_space {};
time_t creation_timestamp { 0 };
DateTime creation_timestamp;
Optional<PrimaryPlatform> primary_platform {};
Flags flags;
Optional<DeviceManufacturer> device_manufacturer;
@ -219,7 +235,7 @@ public:
ColorSpace connection_space() const { return m_header.connection_space; }
u32 on_disk_size() const { return m_header.on_disk_size; }
time_t creation_timestamp() const { return m_header.creation_timestamp; }
DateTime creation_timestamp() const { return m_header.creation_timestamp; }
Optional<PrimaryPlatform> primary_platform() const { return m_header.primary_platform; }
Flags flags() const { return m_header.flags; }
Optional<DeviceManufacturer> device_manufacturer() const { return m_header.device_manufacturer; }