commit e9eb431e456f274f4edbff267e55e70ec80aedf9
author Dimitry Ivanov <dimitry@google.com> Wed May 11 05:05:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 11 05:05:39 2016 +0000
tree a469d602fa5da94f6316a746b0e4ffac50dbfbad
parent fe0bd16b40cc7b2892ae81bf8538299c2cf91a2f
parent 732a01011b8b71c6b885545b495ee457941c12af

Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev am: 6edd0c3a68
am: d7cbb6f053

* commit 'd7cbb6f053c29c9967c25b5723be32ae6d26f97d':
  nativeloader: Ignore empty java_permitted_path

Change-Id: I52ace7c3de380e0b0aa3202b6e07a003222f0d30

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index cf8a089..0df5dbc 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -78,7 +78,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(), target_sdk_version)) {