commit 98bac70af6ae6bf5e4d5dccc4f871fe22e927abe
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 29 16:08:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 29 16:08:15 2019 +0000
tree 3169b188e0cb3f33e322a5c6cdd23a4fd82a949a
parent 4ca394b60756efae0a5432806cd49ddf8b222eb3
parent be008e2ceeed92f40d89da4b9d5d32c0a8f02b58

Merge "Nativeloader: Restrict anonymous namespace creation"

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 6666937..1012ea0 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -220,7 +220,9 @@
       }
     }
 
-    if (!initialized_ && !InitPublicNamespace(library_path.c_str(), error_msg)) {
+    // Initialize the anonymous namespace with the first non-empty library path.
+    if (!library_path.empty() && !initialized_ &&
+        !InitPublicNamespace(library_path.c_str(), error_msg)) {
       return nullptr;
     }