diff options
author | Adam Lesinski <adamlesinski@google.com> | 2016-07-18 17:01:14 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2016-07-18 17:07:41 -0700 |
commit | 526d73be4a3a2714fa6112769e16fb6cd0194451 (patch) | |
tree | 5b1f6862bed22be84c5547ad0bb2b2c317604b45 /tools/aapt/ResourceTable.cpp | |
parent | 699e1bc74bb00d81b9680c826828678847caf205 (diff) |
AAPT: Don't keep processing files that failed to be added
AAPT will continue ahead without reporting an error if a file
failed to be added to the ResourceTable. This would cause crashes
later when the file was assumed to be present.
Bug:30200166
Change-Id: Ieb2daf97ccf0345153b6f4598d130a38d108c937
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
-rw-r--r-- | tools/aapt/ResourceTable.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 6a4b63789815..6d80a69b7444 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4521,6 +4521,7 @@ bool ResourceTable::shouldGenerateVersionedResource( const ConfigDescription& sourceConfig, const int sdkVersionToGenerate) { assert(sdkVersionToGenerate > sourceConfig.sdkVersion); + assert(configList != NULL); const DefaultKeyedVector<ConfigDescription, sp<ResourceTable::Entry>>& entries = configList->getEntries(); ssize_t idx = entries.indexOfKey(sourceConfig); |