git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-07-28 17:15:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

svg_loader SvgLoader: Fix memory leak of duplicate declared id

Browse source 
Duplicate declaration of id attribute is invaild.
We do not have a separate policy for invalid svg files.
Therefore, it is a priority to prevent crashes or memory leaks.
If an id is declared as duplicate, the last declared id is used.
This commit is contained in:
JunsuChoi 2021-07-12 10:14:51 +09:00 • committed by Hermet Park
parent 99c37d01cc
commit f9d82c2c28
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/loaders/svg/tvgSvgLoader.cpp
View file

@ -990,6 +990,7 @@ static bool _attrParseGNode(void* data, const char* key, const char* value)
} else if (!strcmp(key, "transform")) { } else if (!strcmp(key, "transform")) {
node->transform = _parseTransformationMatrix(value); node->transform = _parseTransformationMatrix(value);
} else if (!strcmp(key, "id")) { } else if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else if (!strcmp(key, "clip-path")) { } else if (!strcmp(key, "clip-path")) {
_handleClipPathAttr(loader, node, value); _handleClipPathAttr(loader, node, value);
@ -1015,6 +1016,7 @@ static bool _attrParseClipPathNode(void* data, const char* key, const char* valu
} else if (!strcmp(key, "transform")) { } else if (!strcmp(key, "transform")) {
node->transform = _parseTransformationMatrix(value); node->transform = _parseTransformationMatrix(value);
} else if (!strcmp(key, "id")) { } else if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else { } else {
return _parseStyleAttr(loader, key, value, false); return _parseStyleAttr(loader, key, value, false);
@ -1033,6 +1035,7 @@ static bool _attrParseMaskNode(void* data, const char* key, const char* value)
} else if (!strcmp(key, "transform")) { } else if (!strcmp(key, "transform")) {
node->transform = _parseTransformationMatrix(value); node->transform = _parseTransformationMatrix(value);
} else if (!strcmp(key, "id")) { } else if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else { } else {
return _parseStyleAttr(loader, key, value, false); return _parseStyleAttr(loader, key, value, false);
@ -1175,6 +1178,7 @@ static bool _attrParsePathNode(void* data, const char* key, const char* value)
} else if (!strcmp(key, "mask")) { } else if (!strcmp(key, "mask")) {
_handleMaskAttr(loader, node, value); _handleMaskAttr(loader, node, value);
} else if (!strcmp(key, "id")) { } else if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else { } else {
return _parseStyleAttr(loader, key, value, false); return _parseStyleAttr(loader, key, value, false);
@ -1234,6 +1238,7 @@ static bool _attrParseCircleNode(void* data, const char* key, const char* value)
} else if (!strcmp(key, "mask")) { } else if (!strcmp(key, "mask")) {
_handleMaskAttr(loader, node, value); _handleMaskAttr(loader, node, value);
} else if (!strcmp(key, "id")) { } else if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else { } else {
return _parseStyleAttr(loader, key, value, false); return _parseStyleAttr(loader, key, value, false);
@ -1287,6 +1292,7 @@ static bool _attrParseEllipseNode(void* data, const char* key, const char* value
} }
if (!strcmp(key, "id")) { if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else if (!strcmp(key, "style")) { } else if (!strcmp(key, "style")) {
return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader); return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
@ -1370,6 +1376,7 @@ static bool _attrParsePolygonNode(void* data, const char* key, const char* value
} else if (!strcmp(key, "mask")) { } else if (!strcmp(key, "mask")) {
_handleMaskAttr(loader, node, value); _handleMaskAttr(loader, node, value);
} else if (!strcmp(key, "id")) { } else if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else { } else {
return _parseStyleAttr(loader, key, value, false); return _parseStyleAttr(loader, key, value, false);
@ -1443,6 +1450,7 @@ static bool _attrParseRectNode(void* data, const char* key, const char* value)
} }
if (!strcmp(key, "id")) { if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else if (!strcmp(key, "style")) { } else if (!strcmp(key, "style")) {
ret = simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader); ret = simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
@ -1505,6 +1513,7 @@ static bool _attrParseLineNode(void* data, const char* key, const char* value)
} }
if (!strcmp(key, "id")) { if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else if (!strcmp(key, "style")) { } else if (!strcmp(key, "style")) {
return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader); return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
@ -1574,6 +1583,7 @@ static bool _attrParseImageNode(void* data, const char* key, const char* value)
if (!strcmp(key, "href") || !strcmp(key, "xlink:href")) { if (!strcmp(key, "href") || !strcmp(key, "xlink:href")) {
image->href = _idFromHref(value); image->href = _idFromHref(value);
} else if (!strcmp(key, "id")) { } else if (!strcmp(key, "id")) {
if (node->id && value) delete node->id;
node->id = _copyId(value); node->id = _copyId(value);
} else if (!strcmp(key, "style")) { } else if (!strcmp(key, "style")) {
return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader); return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);