Skip to content

fix: use checked arithmetic in ICC tag parsing #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veluca93 merged 1 commit into from
Jan 5, 2026
Merged

fix: use checked arithmetic in ICC tag parsing #607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions jxl/src/icc/tag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ pub(super) fn read_tag_list(
};

let tagstart = if command & 64 == 0 {
prev_tagstart + prev_tagsize
prev_tagstart
.checked_add(prev_tagsize)
.ok_or(Error::InvalidIccStream)?
} else {
read_varint_from_reader(commands_stream)? as u32
};
Expand All @@ -68,6 +70,13 @@ pub(super) fn read_tag_list(
prev_tagstart = tagstart;
prev_tagsize = tagsize;

let tagstart_plus_size = tagstart
.checked_add(tagsize)
.ok_or(Error::InvalidIccStream)?;
let tagstart_plus_size_x2 = tagstart
.checked_add(tagsize.checked_mul(2).ok_or(Error::InvalidIccStream)?)
.ok_or(Error::InvalidIccStream)?;

let write_result = (|| -> std::io::Result<()> {
decoded_profile.write_all(&tag)?;
decoded_profile.write_u32::<BigEndian>(tagstart)?;
Expand All @@ -81,10 +90,10 @@ pub(super) fn read_tag_list(
decoded_profile.write_u32::<BigEndian>(tagsize)?;
} else if tagcode == 3 {
decoded_profile.write_all(b"gXYZ")?;
decoded_profile.write_u32::<BigEndian>(tagstart + tagsize)?;
decoded_profile.write_u32::<BigEndian>(tagstart_plus_size)?;
decoded_profile.write_u32::<BigEndian>(tagsize)?;
decoded_profile.write_all(b"bXYZ")?;
decoded_profile.write_u32::<BigEndian>(tagstart + tagsize * 2)?;
decoded_profile.write_u32::<BigEndian>(tagstart_plus_size_x2)?;
decoded_profile.write_u32::<BigEndian>(tagsize)?;
}
Ok(())
Expand Down
Loading