commit 179fea40bb1ed2da183f3a2a6398d1c68b9f6f32
author Dimitry Ivanov <dimitry@google.com> Mon May 09 19:17:10 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 09 19:17:10 2016 +0000
tree d7d92f136687cf30e93c2e3c240df9eeb0e0d400
parent fc2a8b2bd605e4639db0feaab49c516c0ae90180
parent 8a0425b86acd4f20ef68ef350ac32e1c5057c558

Merge "nativeloader: Fix the case of search_path == null"

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 7f21375..33d5b62 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -54,7 +54,12 @@
                               bool is_shared,
                               jstring java_library_path,
                               jstring java_permitted_path) {
-    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) {