Skip to content

Fix: SO in CIccBasicStructFactory::CreateStruct() #630

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
Merged

Fix: SO in CIccBasicStructFactory::CreateStruct() #630

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
21 changes: 12 additions & 9 deletions IccProfLib/IccTagComposite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,13 +358,17 @@ bool CIccTagStruct::Read(icUInt32Number size, CIccIO *pIO)
if (headerSize > size)
return false;

if (!pIO) {
if (!pIO)
return false;
}

Cleanup();

m_tagStart = (icUInt32Number) pIO->Tell();

// Make sure the tag size is somewhat reasonable
// NOTE - ccox - it would be nice to cache the file length instead of calculating it per tag
if (size > pIO->GetLength())
return false;

if (!pIO->Read32(&sig))
return false;
Expand Down Expand Up @@ -400,16 +404,13 @@ bool CIccTagStruct::Read(icUInt32Number size, CIccIO *pIO)
m_ElemEntries->push_back(TagEntry);
}

TagEntryList::iterator entry;

for (entry=m_ElemEntries->begin(); entry!=m_ElemEntries->end(); entry++) {
if (!LoadElem((IccTagEntry*)&(entry->TagInfo), pIO)) {
for (auto entry : *m_ElemEntries ) {
if (!LoadElem(&entry, pIO)) {
Cleanup();
return false;
}
}


return true;
}

Expand Down Expand Up @@ -857,9 +858,11 @@ bool CIccTagStruct::LoadElem(IccTagEntry *pTagEntry, CIccIO *pIO)
sizeof(icUInt32Number) +
sizeof(icUInt32Number);

if (pTagEntry->TagInfo.offset<headerSize ||
// make sure we avoid 32 bit overflow when calculating the size to be read
size_t temp = pTagEntry->TagInfo.offset + (size_t)pTagEntry->TagInfo.size;
if (pTagEntry->TagInfo.offset < headerSize ||
!pTagEntry->TagInfo.size ||
pTagEntry->TagInfo.offset+pTagEntry->TagInfo.size > m_tagSize) {
temp > (size_t)m_tagSize) {
return false;
}

Expand Down
Loading