| commit | 5b71204ee80f5a0e748b109d7ee6baef506a1635 | [log] [tgz] |
|---|---|---|
| author | Greg Kaiser <gkaiser@google.com> | Mon Feb 25 23:13:19 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Feb 25 23:13:19 2019 -0800 |
| tree | 19f4840c054e3e8ed01794980c37129bd7acd763 | |
| parent | 684e4b11146227f7a72313878d3cb3db38e4feb2 [diff] | |
| parent | a1a91eae0292701dc60c4017e4871cd5f5dba7dd [diff] |
Merge "MemoryDealer: Avoid using invalid iterator" am: a1a91eae02 Change-Id: I4e1f573c4ffbc6af3674f36833323a3de11ea1cc
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;