commit d995da440bb9be037be65c4bd281d72746f169e5
author Dimitry Ivanov <dimitry@google.com> Wed May 11 07:36:31 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 11 07:36:31 2016 +0000
tree f300078df2d351f3a83268a7c8be66290d46eb8f
parent 4567e30b7b388a592a7f26d8fae67cdc725080f7
parent 0c73bf09e196f2d2f64117849741ab6939035f00

Merge "nativeloader: Ignore empty java_permitted_path"

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index dca316c..0414385 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -76,7 +76,9 @@
 
     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())) {