From 72ca40f738a86d9bb8d1cdfb06ce20ca4493bf61 Mon Sep 17 00:00:00 2001
From: Dimitry Ivanov <dimitry@google.com>
Date: Tue, 10 May 2016 16:21:25 -0700
Subject: nativeloader: Ignore empty java_permitted_path

Passing empty permitted path should result in no-op.
This addresses review comment on CL with commit
f334cbf0e1425633bef96a21b0ce9e30f4c6ffa9

Bug: http://b/28639227
Change-Id: I4a4540e522e90a145a374939921932c86f35e88d
(cherry picked from commit d0b1531929d76411d964d4077d441d751e2c01fb)
---
 libnativeloader/native_loader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libnativeloader/native_loader.cpp')

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index dca316c56..04143853e 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -76,7 +76,9 @@ class LibraryNamespaces {
 
     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())) {
-- 
cgit v1.2.3