summaryrefslogtreecommitdiff
path: root/libnativeloader/native_loader.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-04-29 16:08:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-04-29 16:08:15 +0000
commitd21a090f7924bb89dd146a6fd6f88d99aa7d457d (patch)
tree3169b188e0cb3f33e322a5c6cdd23a4fd82a949a /libnativeloader/native_loader.cpp
parentbce25d2363c65f0a8ebb9f045c1d392cd7d7eb9a (diff)
parentb9df7d936c7dfd1741b56e722065a46ac1e50607 (diff)
Merge "Nativeloader: Restrict anonymous namespace creation"
Diffstat (limited to 'libnativeloader/native_loader.cpp')
-rw-r--r--libnativeloader/native_loader.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 6666937b4..1012ea012 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -220,7 +220,9 @@ class LibraryNamespaces {
}
}
- 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;
}