Skip to content

Fix: HBO in CIccXmlArrayType<> #631

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
xsscx merged 1 commit into from
Mar 1, 2026
+10 −2
Merged

Fix: HBO in CIccXmlArrayType<> #631

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
12 changes: 10 additions & 2 deletions IccProfLib/IccTagBasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4654,11 +4654,12 @@ bool CIccTagSparseMatrixArray::Read(icUInt32Number size, CIccIO *pIO)
if (!mtx.Reset(pMatrix, nBytesPerMatrix, icSparseMatrixFloatNum, true))
return false;

size_t num_entries = mtx.GetNumEntries();
icUInt16Number num_entries = mtx.GetNumEntries();
if (num_entries == 0)
return false;

if (mtx.GetNumEntries()>mtx.MaxEntries(nChannels*sizeof(icFloatNumber), mtx.Rows(), sizeof(icFloatNumber)))
icUInt32Number maxEntries = mtx.MaxEntries(nChannels*sizeof(icFloatNumber), mtx.Rows(), sizeof(icFloatNumber));
if (num_entries > maxEntries)
return false;

n = (icUInt32Number) (num_entries*sizeof(icUInt16Number));
Expand Down Expand Up @@ -4740,6 +4741,13 @@ bool CIccTagSparseMatrixArray::Read(icUInt32Number size, CIccIO *pIO)
nSizeLeft -= n;
pos += n;

// validate column counts that will be used later (and could cause a crash)
for (j=0; j<(int)mtx.Rows(); j++) {
n = mtx.GetNumRowColumns(j);
if (n > mtx.Cols())
return false;
}

nAligned = ((pos+3)/4)*4;
if (nAligned != pos) {
n = nAligned - pos;
Expand Down
Loading