Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77a2e830 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Fix nullpointer dereference in libnativeloader" 

am: 724cbb08

Change-Id: Iba547fc4ca6539cae2e028b1d58ecec657c9886f
parents 7c42bc5f 724cbb08

libnativeloader/native_loader_namespace.cpp

+3 −4
Original line number Diff line number Diff line
@@ -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());

  }

}

libnativeloader/native_loader_namespace.h

+1 −1
Original line number Diff line number Diff line
@@ -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);