commit 31b6d79a7c3deeea7beab43acd8e227ed1e7b444
author Dimitry Ivanov <dimitry@google.com> Wed May 11 04:58:16 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 11 04:58:17 2016 +0000
tree 577d57408213661a199d6939abb76a716335cc5f
parent 1229833b449730eeb2712cd8afc16fb13c8b0b00
parent 306b2acf182a477af118225067859d78b43cd900

Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 0b49b41..8103b37 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)) {