commit 947aa13d4f4dbcba9db4ecd56f57b7686e65821f
author Dimitry Ivanov <dimitry@google.com> Wed May 11 07:40:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 11 07:40:59 2016 +0000
tree f300078df2d351f3a83268a7c8be66290d46eb8f
parent cb5c1031f2e92779c6d4a2b9518c9a5441273f3a
parent d995da440bb9be037be65c4bd281d72746f169e5

Merge "nativeloader: Ignore empty java_permitted_path"
am: 39d1230ee3

* commit '39d1230ee31c704e95ec45048ff812a2b6aae5bf':
  nativeloader: Ignore empty java_permitted_path

Change-Id: Iab7b81414593760f4a9d5b02a5be3ea6f6b9720a

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())) {