commit f91b034d842eda4f05fe1509f70d29abc1ee09f9
author Jiyong Park <jiyong@google.com> Fri May 17 20:54:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 17 20:54:15 2019 -0700
tree bc0fcda73f05f688bc99ab48e8d16e01946d26e1
parent 44456a51978e5d32fc435da693debbf60d25f204
parent af782f4d080c3cd56a4d522522ffeaa6aac2ab90

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

Change-Id: I699e314a7a0c68dad3bd9a977862ce31a17af555

libnativeloader/native_loader_namespace.cpp

diff --git a/libnativeloader/native_loader_namespace.cpp b/libnativeloader/native_loader_namespace.cpp
index 90f730c..58ac686 100644
--- a/libnativeloader/native_loader_namespace.cpp
+++ b/libnativeloader/native_loader_namespace.cpp
@@ -115,15 +115,14 @@
   }
 }
 
-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());
   }
 }
 

libnativeloader/native_loader_namespace.h

diff --git a/libnativeloader/native_loader_namespace.h b/libnativeloader/native_loader_namespace.h
index 1575f8c..71e4247 100644
--- a/libnativeloader/native_loader_namespace.h
+++ b/libnativeloader/native_loader_namespace.h
@@ -52,7 +52,7 @@
   }
 
   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);