commit da8bfeae123258b15c90ee8f979801cef702c170
author Dimitry Ivanov <dimitry@google.com> Wed May 25 06:53:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 06:53:23 2016 +0000
tree 5381299da8a347074a172734d2839070918be9f1
parent 7b703dd104e5791373b30a95a1f0143cb4c10d06
parent bda20e78f0f314dbbf0f0bbcf0740cf2d6a4b85e

Correctly handle the case of empty LD_PRELOAD entries
am: bda20e78f0

* commit 'bda20e78f0f314dbbf0f0bbcf0740cf2d6a4b85e':
  Correctly handle the case of empty LD_PRELOAD entries

Change-Id: I8278e77864b0b85af94e527ec0d34eba052ec13a

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 9836210..39aa2ca 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -543,6 +543,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(); });
   }
 }