commit 2e998d37ce5be9833c595bc97549793a81459ed4
author Treehugger Robot <treehugger-gerrit@google.com> Sat Oct 21 02:59:27 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 21 02:59:27 2017 +0000
tree 8c60543178f3b463555b2e42638a3d5cc9da0d87
parent 8f348a0cce048fc929b4ce0b850147cd7c737497
parent 27242c642eac64d4d47a1899af341170c9456d79

Merge "Actually correctly call vector::erase after remove_if."

linker/linker_main.cpp

diff --git a/linker/linker_main.cpp b/linker/linker_main.cpp
index 46cd60c..317f0d2 100644
--- a/linker/linker_main.cpp
+++ b/linker/linker_main.cpp
@@ -130,7 +130,8 @@
     // We have historically supported ':' as well as ' ' in LD_PRELOAD.
     g_ld_preload_names = android::base::Split(path, " :");
     g_ld_preload_names.erase(std::remove_if(g_ld_preload_names.begin(), g_ld_preload_names.end(),
-                                            [](const std::string& s) { return s.empty(); }));
+                                            [](const std::string& s) { return s.empty(); }),
+                             g_ld_preload_names.end());
   }
 }