Skip to content

Fix: leak in XML tag parsing on duplicate tag signatures (#1306) #1307

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
colourbill-ctrl merged 1 commit into from
Jun 11, 2026
Merged

Fix: leak in XML tag parsing on duplicate tag signatures (#1306) #1307

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
18 changes: 15 additions & 3 deletions IccXML/IccLibXML/IccProfileXml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,16 @@ bool CIccProfileXml::ParseTag(xmlNode *pNode, std::string &parseStr)
if ((attr = icXmlFindAttr(pTypeNode, "reserved"))) {
sscanf(icXmlAttrValue(attr), "%x", &pTag->m_nReserved);
}
AttachTag(sigTag, pTag);
//AttachTag refuses (and does not take ownership) when a tag with this
//signature already exists; free pTag to avoid a leak on duplicates.
if (!AttachTag(sigTag, pTag)) {
parseStr += "Unable to attach duplicate tag \"";
parseStr += nodeName;
snprintf(str, strSize, "\" on line %d\n", pTypeNode->line);
parseStr += str;
delete pTag;
return false;
}
}
else {
parseStr += "Unable to Parse \"";
Expand Down Expand Up @@ -757,8 +766,11 @@ bool CIccProfileXml::ParseTag(xmlNode *pNode, std::string &parseStr)
if (tagSigNode->type == XML_ELEMENT_NODE && !icXmlStrCmp(tagSigNode->name, "TagSignature")) {
if ((const icChar*)tagSigNode->children != NULL) {
sigTag = (icTagSignature)icGetSigVal((const icChar*)tagSigNode->children->content);
AttachTag(sigTag, pTag);
bAttached = true;
//Only flag ownership transfer when AttachTag actually accepts pTag.
//It refuses duplicate signatures without taking ownership, so a
//blanket bAttached=true here would leak pTag on a duplicate tag.
if (AttachTag(sigTag, pTag))
bAttached = true;
}
}
}
Expand Down
Loading