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

am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt"

Browse Source 
* commit '8aa93764ea025b1c20f96b366ae6efb17e4f2d67':
  Fixing NULL pointer access causing segmentation fault in aapt
This commit is contained in:
Adam Lesinski
2014-11-11 19:53:52 +00:00
committed by Android Git Automerger
parent 044f323e62 8aa93764ea
commit d660e05c84
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/ResourceTable.cpp
View File

@@ -3011,7 +3011,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>&
// We need to write one type chunk for each configuration for // We need to write one type chunk for each configuration for
// which we have entries in this type. // which we have entries in this type.
const size_t NC = t->getUniqueConfigs().size(); const size_t NC = t != NULL ? t->getUniqueConfigs().size() : 0;
const size_t typeSize = sizeof(ResTable_type) + sizeof(uint32_t)*N; const size_t typeSize = sizeof(ResTable_type) + sizeof(uint32_t)*N;