commit f18bea4cab4ce1697c460254ae64f673d8c3a0c7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 26 19:20:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 26 19:20:14 2020 +0000
tree 07d5e328fbfc84ae4dda0c8d632ee601c68cc23e
parent 791f7e9906e1f9ff9deed8dc136bce5fd7f68b73
parent f490e3fe2a5c37df4f5aa3e70bd38699a3ebc784

Merge "session: Fix a use-after-free bug." into rvc-dev am: f490e3fe2a

Change-Id: Ib3d3fde7b4b28a45de1fa86ba433dcad2577a698

src/prefetcher/session.cc

diff --git a/src/prefetcher/session.cc b/src/prefetcher/session.cc
index 79947b0..e998580 100644
--- a/src/prefetcher/session.cc
+++ b/src/prefetcher/session.cc
@@ -591,9 +591,10 @@
 }
 
 SessionDirect::~SessionDirect() {
-  for (auto it = entry_list_map_.begin(); it != entry_list_map_.end(); ++it) {
+  for (auto it = entry_list_map_.begin(); it != entry_list_map_.end();) {
     size_t path_id = it->first;
 
+    ++it; // the iterator is removed in the following Unregister method.
     UnregisterFilePath(path_id);
   }
 }