Merge "Fixing NULL pointer access causing segmentation fault in aapt"

2014-11-11 19:36:19 +00:00
parent 24c16b7e4c da44fe0e1f
commit 8aa93764ea
1 changed files with 1 additions and 1 deletions
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -3009,7 +3009,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;