commit 8aa93764ea025b1c20f96b366ae6efb17e4f2d67
author Adam Lesinski <adamlesinski@google.com> Tue Nov 11 19:36:19 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 11 19:36:20 2014 +0000
tree 2525ee3874b302413341dd79af08f74b7fd5870b
parent 24c16b7e4cdbacedd33347a01ff4944abfc86218
parent da44fe0e1f7c177cd65b7c5c80b35ec8fb3bc1c2

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

tools/aapt/ResourceTable.cpp

diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 4cca57f..0ec1aeb 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -3009,7 +3009,7 @@
 
             // 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;