commit fa1062fb1dd0a65e3847a9d60d0d4a0886b9cd3e
author Greg Kaiser <gkaiser@google.com> Tue Feb 26 00:24:07 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 26 00:24:07 2019 -0800
tree 0ba8f28ff53176b8a996d14ae88c8fce598969eb
parent 87f4571b117b8736fd8d20ab8f4e048a1100b678
parent 7806b628ba3e297b84f92a860ebc0cbc86ff881a

Merge "MemoryDealer: Avoid using invalid iterator" am: a1a91eae02 am: 5b71204ee8
am: 7806b628ba

Change-Id: Ib967cb121bcd0672fe2997709f8cb69866d9e399

libhidlcache/MemoryDealer.cpp

diff --git a/libhidlcache/MemoryDealer.cpp b/libhidlcache/MemoryDealer.cpp
index e0e18c7..e5686a7 100644
--- a/libhidlcache/MemoryDealer.cpp
+++ b/libhidlcache/MemoryDealer.cpp
@@ -221,8 +221,9 @@
                     if (p->free || !cur->size) {
                         freed = p;
                         p->size += cur->size;
-                        mList.erase(pos);
+                        pos = mList.erase(pos);
                         delete cur;
+                        if (pos == mList.end()) break;
                     }
                 }
                 if (++pos == mList.end()) break;