Skip to content

warning instead of error for invalid icc #48

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

Open
mertalev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

warning instead of error for invalid icc #48

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,4 @@ xiota
Yonatan Nebenzhal <yonatan.nebenzhl@gmail.com>
Ziemowit Zabawa <ziemek.zabawa@outlook.com>
源文雨 <41315874+fumiama@users.noreply.github.com>
Mert Alev <101130780+mertalev@users.noreply.github.com>
15 changes: 10 additions & 5 deletions lib/jpegli/decode_marker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,24 +409,29 @@ void ProcessAPP(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
payload += sizeof(kIccProfileTag);
payload_size -= sizeof(kIccProfileTag);
if (payload_size < 2) {
JPEGLI_ERROR("ICC chunk is too small.");
JPEGLI_WARN("ICC chunk is too small.");
return;
}
uint8_t index = payload[0];
uint8_t total = payload[1];
++m->icc_index_;
if (m->icc_index_ != index) {
JPEGLI_ERROR("Invalid ICC chunk order.");
JPEGLI_WARN("Invalid ICC chunk order.");
return;
}
if (total == 0) {
JPEGLI_ERROR("Invalid ICC chunk total.");
JPEGLI_WARN("Invalid ICC chunk total.");
return;
}
if (m->icc_total_ == 0) {
m->icc_total_ = total;
} else if (m->icc_total_ != total) {
JPEGLI_ERROR("Invalid ICC chunk total.");
JPEGLI_WARN("Invalid ICC chunk total.");
return;
}
if (m->icc_index_ > m->icc_total_) {
JPEGLI_ERROR("Invalid ICC chunk index.");
JPEGLI_WARN("Invalid ICC chunk index.");
return;
}
m->icc_profile_.insert(m->icc_profile_.end(), payload + 2,
payload + payload_size);
Expand Down