commit 7806b628ba3e297b84f92a860ebc0cbc86ff881a
author Greg Kaiser <gkaiser@google.com> Mon Feb 25 23:45:50 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 25 23:45:50 2019 -0800
tree 19f4840c054e3e8ed01794980c37129bd7acd763
parent 0b2e9d934b3120ef9607b3d1605f1312a9eac862
parent 5b71204ee80f5a0e748b109d7ee6baef506a1635

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

Change-Id: Ibfc9a9070802d5feb87138cbe42ec25326fb643a

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;