Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e40974d9: Merge "Fix an overflow found by ASAN."

Browse Source 
* commit 'e40974d92873462c4f1b100c7d03b3f41756c807':
  Fix an overflow found by ASAN.
This commit is contained in:
Dan Albert
2014-10-20 21:54:41 +00:00
committed by Android Git Automerger
parent dfcf065505 e40974d928
commit 9295a1354e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/Resource.cpp
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);