| commit | a1a91eae0292701dc60c4017e4871cd5f5dba7dd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 26 02:25:13 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 26 02:25:13 2019 +0000 |
| tree | 1e60a27f3bd89d2fa30080488c4fca580ec7356d | |
| parent | f0896f59be8e7640819e9c2063f0fa8a43967b77 [diff] | |
| parent | 6f9074a8e1bfbb65b8f7199cdc1b0be28aa9ad04 [diff] |
Merge "MemoryDealer: Avoid using invalid iterator"
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;