summaryrefslogtreecommitdiff
path: root/libnativeloader/native_loader.cpp
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2016-05-10 16:21:25 -0700
committerDimitry Ivanov <dimitry@google.com>2016-05-10 22:02:05 -0700
commit72ca40f738a86d9bb8d1cdfb06ce20ca4493bf61 (patch)
treef300078df2d351f3a83268a7c8be66290d46eb8f /libnativeloader/native_loader.cpp
parent0756fae4f1aea5072ed820087b2487b408194c38 (diff)
nativeloader: Ignore empty java_permitted_path
Passing empty permitted path should result in no-op. This addresses review comment on CL with commit f334cbf0e1425633bef96a21b0ce9e30f4c6ffa9 Bug: http://b/28639227 Change-Id: I4a4540e522e90a145a374939921932c86f35e88d (cherry picked from commit d0b1531929d76411d964d4077d441d751e2c01fb)
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 dca316c56..04143853e 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -76,7 +76,9 @@ class LibraryNamespaces {
if (java_permitted_path != nullptr) {
ScopedUtfChars path(env, java_permitted_path);
- permitted_path = permitted_path + ":" + path.c_str();
+ if (path.c_str() != nullptr && path.size() > 0) {
+ permitted_path = permitted_path + ":" + path.c_str();
+ }
}
if (!initialized_ && !InitPublicNamespace(library_path.c_str())) {