openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix nullpointer dereference in libnativeloader" am: 724cbb080d 

am: 77a2e830e7

Change-Id: I699e314a7a0c68dad3bd9a977862ce31a17af555
This commit is contained in:
Jiyong Park 2019-05-17 20:54:15 -07:00 committed by android-build-merger
parent 24b1e7ffa9 77a2e830e7
commit aea98f16bb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libnativeloader/native_loader_namespace.cpp
View File

@ -115,15 +115,14 @@ bool NativeLoaderNamespace::Link(const NativeLoaderNamespace& target,
}
}
void* NativeLoaderNamespace::Load(const std::string& lib_name) const {
void* NativeLoaderNamespace::Load(const char* lib_name) const {
if (!IsBridged()) {
android_dlextinfo extinfo;
extinfo.flags = ANDROID_DLEXT_USE_NAMESPACE;
extinfo.library_namespace = this->ToRawAndroidNamespace();
return android_dlopen_ext(lib_name.c_str(), RTLD_NOW, &extinfo);
return android_dlopen_ext(lib_name, RTLD_NOW, &extinfo);
} else {
return NativeBridgeLoadLibraryExt(lib_name.c_str(), RTLD_NOW,
this->ToRawNativeBridgeNamespace());
return NativeBridgeLoadLibraryExt(lib_name, RTLD_NOW, this->ToRawNativeBridgeNamespace());
}
}

2
libnativeloader/native_loader_namespace.h
View File

@ -52,7 +52,7 @@ struct NativeLoaderNamespace {
}
bool Link(const NativeLoaderNamespace& target, const std::string& shared_libs) const;
void* Load(const std::string& lib_name) const;
void* Load(const char* lib_name) const;
char* GetError() const;
static NativeLoaderNamespace GetExportedNamespace(const std::string& name, bool is_bridged);