commit c0a65a794e2061cac9422cc87060aec4fd9748a6
author Dimitry Ivanov <dimitry@google.com> Mon May 09 19:21:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 09 19:21:26 2016 +0000
tree d7d92f136687cf30e93c2e3c240df9eeb0e0d400
parent 41aa930bb64790ee00d7d658fb561f18b5a95a2e
parent 01b99b74e38417abc45c77d4ccc876cde9444d2e

Merge "nativeloader: Fix the case of search_path == null"
am: 179fea40bb

* commit '179fea40bb1ed2da183f3a2a6398d1c68b9f6f32':
  nativeloader: Fix the case of search_path == null

Change-Id: Idb502568c161693877c30bb7cd085e974433aa8f

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