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

am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev

Browse Source 
* commit '799dc7483f6c6a4b554f2a3dad4b801371347cea':
  AAPT: Don't crash on illegal symbol name
This commit is contained in:
Adam Lesinski
2014-09-09 23:25:02 +00:00
committed by Android Git Automerger
parent 463f4c10b4 e7ad74f070
commit 99d0ad0dff
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aapt/ResourceTable.cpp
View File

@@ -2574,8 +2574,12 @@ status_t ResourceTable::addSymbols(const sp<AaptSymbols>& outSymbols) {
continue;
}
const size_t N = t->getOrderedConfigs().size();
sp<AaptSymbols> typeSymbols;
typeSymbols = outSymbols->addNestedSymbol(String8(t->getName()), t->getPos());
sp<AaptSymbols> typeSymbols =
outSymbols->addNestedSymbol(String8(t->getName()), t->getPos());
if (typeSymbols == NULL) {
return UNKNOWN_ERROR;
}
for (size_t ci=0; ci<N; ci++) {
sp<ConfigList> c = t->getOrderedConfigs().itemAt(ci);
if (c == NULL) {