commit 5fa57176746b78a3c42b909104d9cf4690ff14cb
author Dimitry Ivanov <dimitry@google.com> Tue May 24 23:13:06 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 24 23:13:06 2016 +0000
tree c287adb0a92322d167f9b26949e9564363996bb0
parent d1c96e21593fe5ff4c2989b9902036c65532b4fd
parent d799b2bb7e9335786ab4596757d871e4a7722ff0

Merge "Correctly handle the case of empty LD_PRELOAD entries"

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 719b00a..9eb3a65 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -475,6 +475,9 @@
   if (path != nullptr) {
     // We have historically supported ':' as well as ' ' in LD_PRELOAD.
     g_ld_preload_names = android::base::Split(path, " :");
+    std::remove_if(g_ld_preload_names.begin(),
+                   g_ld_preload_names.end(),
+                   [] (const std::string& s) { return s.empty(); });
   }
 }