diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-11-11 19:53:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-11 19:53:52 +0000 |
| commit | d660e05c84c7412336ca5510ff9514357e9ba074 (patch) | |
| tree | c8ef441a63ea9289c94c74907de6a7152ff790ba /tools/aapt/ResourceTable.cpp | |
| parent | 044f323e624084de464e780828f1d7f204e4d01d (diff) | |
| parent | 8aa93764ea025b1c20f96b366ae6efb17e4f2d67 (diff) | |
| download | frameworks_base-d660e05c84c7412336ca5510ff9514357e9ba074.zip frameworks_base-d660e05c84c7412336ca5510ff9514357e9ba074.tar.gz frameworks_base-d660e05c84c7412336ca5510ff9514357e9ba074.tar.bz2 | |
am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt"
* commit '8aa93764ea025b1c20f96b366ae6efb17e4f2d67':
Fixing NULL pointer access causing segmentation fault in aapt
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 54e0b88..69f1ec3 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -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 // 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; |