Ignore malformed attributes in XML

This commit is contained in:
djack1010 2017-04-22 23:45:24 +02:00
parent 4310325aba
commit fe14c0386c

View File

@ -279,6 +279,9 @@ static void nsvg__parseElement(char* s,
// Get attribs // Get attribs
while (!end && *s && nattr < NSVG_XML_MAX_ATTRIBS-3) { while (!end && *s && nattr < NSVG_XML_MAX_ATTRIBS-3) {
char* attr_ptr = NULL;
char* value_ptr = NULL;
// Skip white space before the attrib name // Skip white space before the attrib name
while (*s && nsvg__isspace(*s)) s++; while (*s && nsvg__isspace(*s)) s++;
if (!*s) break; if (!*s) break;
@ -286,7 +289,7 @@ static void nsvg__parseElement(char* s,
end = 1; end = 1;
break; break;
} }
attr[nattr++] = s; attr_ptr = s;
// Find end of the attrib name. // Find end of the attrib name.
while (*s && !nsvg__isspace(*s) && *s != '=') s++; while (*s && !nsvg__isspace(*s) && *s != '=') s++;
if (*s) { *s++ = '\0'; } if (*s) { *s++ = '\0'; }
@ -296,9 +299,15 @@ static void nsvg__parseElement(char* s,
quote = *s; quote = *s;
s++; s++;
// Store value and find the end of it. // Store value and find the end of it.
attr[nattr++] = s; value_ptr = s;
while (*s && *s != quote) s++; while (*s && *s != quote) s++;
if (*s) { *s++ = '\0'; } if (*s) { *s++ = '\0'; }
// Store only well formed attributes
if (attr_ptr && value_ptr) {
attr[nattr++] = attr_ptr;
attr[nattr++] = value_ptr;
}
} }
// List terminator // List terminator