commit 60163c57efddfc8d25f35c3cfe3e3a6dacd603f1
author Andreas Gampe <agampe@google.com> Mon Apr 29 22:07:08 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 29 22:07:08 2019 +0000
tree 2cc2041e6557f79ce5928e73479ec9a6e20d5cc7
parent 816d76429bcd7c23cf099ac06c3319a0f9c476ad
parent fc44925a27e33a6c6a7efcb45ce4da1ea3a69bd3

Merge "Nativeloader: Restrict anonymous namespace creation" into qt-dev

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 5cc0857..e460b1a 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;
     }