Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5097b289 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

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

* commit 'd660e05c':
  Fixing NULL pointer access causing segmentation fault in aapt
parents 4a4a2a67 d660e05c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;