commit cba380a2df1212c8c47e7645701d847bbd1fc100
author Dimitry Ivanov <dimitry@google.com> Mon May 09 10:55:50 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Mon May 09 12:21:55 2016 -0700
tree 3c6fed38a2454bd68921a581c85e26768eed516a
parent 189db07a6e512668aa77026353b4692c8985f43b

nativeloader: Fix the case of search_path == null

When user creates custom classloader which does not extend
BaseDexClassLoader the librarySearchPath gets set to null
by java.lang.Runtime.doLoad().

This patch makes nativeloader correctly handle it.

Bug: http://b/28659864
Change-Id: I1b61c6bc952984d7c49775a9178fc3270948e62a
(cherry picked from commit 8a0425b86acd4f20ef68ef350ac32e1c5057c558)

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 7abc2c3..5c1db5b 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -56,7 +56,12 @@
                               jstring java_library_path,
                               jstring java_permitted_path,
                               int32_t target_sdk_version) {
-    ScopedUtfChars library_path(env, java_library_path);
+    std::string library_path; // empty string by default.
+
+    if (java_library_path != nullptr) {
+      ScopedUtfChars library_path_utf_chars(env, java_library_path);
+      library_path = library_path_utf_chars.c_str();
+    }
 
     std::string permitted_path;
     if (java_permitted_path != nullptr) {