Merge "Fix an overflow found by ASAN."

This commit is contained in:
Dan Albert
2014-10-20 21:48:43 +00:00
committed by Gerrit Code Review

View File

@@ -553,7 +553,7 @@ static int validateAttr(const String8& path, const ResTable& table,
String8(parser.getElementName(&len)).string(), attr); String8(parser.getElementName(&len)).string(), attr);
return ATTR_LEADING_SPACES; return ATTR_LEADING_SPACES;
} }
if (str[len-1] == ' ') { if (len != 0 && str[len-1] == ' ') {
fprintf(stderr, "%s:%d: Tag <%s> attribute %s can not end with a space.\n", fprintf(stderr, "%s:%d: Tag <%s> attribute %s can not end with a space.\n",
path.string(), parser.getLineNumber(), path.string(), parser.getLineNumber(),
String8(parser.getElementName(&len)).string(), attr); String8(parser.getElementName(&len)).string(), attr);