commit d7cbb6f053c29c9967c25b5723be32ae6d26f97d
author Dimitry Ivanov <dimitry@google.com> Wed May 11 05:03:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 11 05:03:07 2016 +0000
tree 02f8d7918d94d9f8d29f7f83abe86727fcfcad9b
parent ddc6a4a0a6d5ee2faab9021ff302142033b16842
parent 6edd0c3a68f60541c31fd65080e52939f2be3bc2

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

* commit '6edd0c3a68f60541c31fd65080e52939f2be3bc2':
  nativeloader: Ignore empty java_permitted_path

Change-Id: I1777b3a05d2e233000815172cfa1e56326be634b

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