git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-09 14:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

svg_loader: fixing crash for to big buffer

Browse source 
Crash observed on macOS for the image-embeded-*.svg files.
Since the alloca function was used the stack allocation failure
could not be handled.
This commit is contained in:
Mira Grudzinska 2023-01-07 00:04:31 +01:00 • committed by Hermet Park
parent 1980d9d0e3
commit ae07b480d0
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/loaders/svg/tvgXmlParser.cpp
View file

@ -304,38 +304,38 @@ bool isIgnoreUnsupportedLogElements(TVG_UNUSED const char* tagName)
bool simpleXmlParseAttributes(const char* buf, unsigned bufLength, simpleXMLAttributeCb func, const void* data) bool simpleXmlParseAttributes(const char* buf, unsigned bufLength, simpleXMLAttributeCb func, const void* data)
{ {
const char *itr = buf, *itrEnd = buf + bufLength; const char *itr = buf, *itrEnd = buf + bufLength;
char* tmpBuf = (char*)alloca(bufLength + 1); char* tmpBuf = (char*)malloc(bufLength + 1);
if (!buf || !func) return false; if (!buf || !func || !tmpBuf) goto error;
while (itr < itrEnd) { while (itr < itrEnd) {
const char* p = _skipWhiteSpacesAndXmlEntities(itr, itrEnd); const char* p = _skipWhiteSpacesAndXmlEntities(itr, itrEnd);
const char *key, *keyEnd, *value, *valueEnd; const char *key, *keyEnd, *value, *valueEnd;
char* tval; char* tval;
if (p == itrEnd) return true; if (p == itrEnd) goto success;
key = p; key = p;
for (keyEnd = key; keyEnd < itrEnd; keyEnd++) { for (keyEnd = key; keyEnd < itrEnd; keyEnd++) {
if ((*keyEnd == '=') || (isspace((unsigned char)*keyEnd))) break; if ((*keyEnd == '=') || (isspace((unsigned char)*keyEnd))) break;
} }
if (keyEnd == itrEnd) return false; if (keyEnd == itrEnd) goto error;
if (keyEnd == key) continue; if (keyEnd == key) continue;
if (*keyEnd == '=') value = keyEnd + 1; if (*keyEnd == '=') value = keyEnd + 1;
else { else {
value = (const char*)memchr(keyEnd, '=', itrEnd - keyEnd); value = (const char*)memchr(keyEnd, '=', itrEnd - keyEnd);
if (!value) return false; if (!value) goto error;
value++; value++;
} }
keyEnd = _simpleXmlUnskipXmlEntities(keyEnd, key); keyEnd = _simpleXmlUnskipXmlEntities(keyEnd, key);
value = _skipWhiteSpacesAndXmlEntities(value, itrEnd); value = _skipWhiteSpacesAndXmlEntities(value, itrEnd);
if (value == itrEnd) return false; if (value == itrEnd) goto error;
if ((*value == '"') || (*value == '\'')) { if ((*value == '"') || (*value == '\'')) {
valueEnd = (const char*)memchr(value + 1, *value, itrEnd - value); valueEnd = (const char*)memchr(value + 1, *value, itrEnd - value);
if (!valueEnd) return false; if (!valueEnd) goto error;
value++; value++;
} else { } else {
valueEnd = _simpleXmlFindWhiteSpace(value, itrEnd); valueEnd = _simpleXmlFindWhiteSpace(value, itrEnd);
@ -364,7 +364,14 @@ bool simpleXmlParseAttributes(const char* buf, unsigned bufLength, simpleXMLAttr
} }
} }
} }
success:
free(tmpBuf);
return true; return true;
error:
free(tmpBuf);
return false;
} }