ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 179fea40bb

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

Change-Id: Idb502568c161693877c30bb7cd085e974433aa8f
This commit is contained in:
Dimitry Ivanov 2016-05-09 19:21:26 +00:00 • committed by android-build-merger
commit 1a3ac02e4c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libnativeloader/native_loader.cpp
View file

@ -54,7 +54,12 @@ class LibraryNamespaces {
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) {