commit 142a7ce5e72c1f234b3d1efe3043a716d9020b14
author Ryan Mitchell <rtmitchell@google.com> Mon Apr 02 19:07:24 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 02 19:07:24 2018 +0000
tree dae807986420035f00713cb963baa53d66a6fddf
parent 922b8db59a02b91a39239c502d8dbb9b34c497bd
parent ac04095ba91f262c9167985a8024607763d8cacc

Merge "Fixed resource bag retrieval infinite recursion."

libs/androidfw/AssetManager2.cpp

diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp
index d9f1293..5460b3b 100644
--- a/libs/androidfw/AssetManager2.cpp
+++ b/libs/androidfw/AssetManager2.cpp
@@ -596,7 +596,7 @@
   const ResTable_map* const map_entry_end = map_entry + dtohl(map->count);
 
   uint32_t parent_resid = dtohl(map->parent.ident);
-  if (parent_resid == 0) {
+  if (parent_resid == 0 || parent_resid == resid) {
     // There is no parent, meaning there is nothing to inherit and we can do a simple
     // copy of the entries in the map.
     const size_t entry_count = map_entry_end - map_entry;