commit c3ba7eee5b070176c9cf8a89358592069903d6e1
author Nicolas Geoffray <ngeoffray@google.com> Wed Jan 16 21:46:48 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jan 16 22:48:26 2019 +0000
tree 4a058dac119e92e4537ada92364e342fd51457d4
parent 181b831d1a215504a80b5c7508fc2c6e1acac40c

Fix use of native loader API.

This slipped in last CL.

Test: m
Bug: 119840313
Change-Id: Ib1f5b62ffc7d32068bddb081dcb219906ecec3ff

runtime/jni/java_vm_ext.cc

diff --git a/runtime/jni/java_vm_ext.cc b/runtime/jni/java_vm_ext.cc
index 6d4ceb5..e7b244b 100644
--- a/runtime/jni/java_vm_ext.cc
+++ b/runtime/jni/java_vm_ext.cc
@@ -963,7 +963,7 @@
   Locks::mutator_lock_->AssertNotHeld(self);
   const char* path_str = path.empty() ? nullptr : path.c_str();
   bool needs_native_bridge = false;
-  char* nativeloader_error_msg;
+  char* nativeloader_error_msg = nullptr;
   void* handle = android::OpenNativeLibrary(env,
                                             runtime_->GetTargetSdkVersion(),
                                             path_str,
@@ -975,7 +975,7 @@
 
   if (handle == nullptr) {
     *error_msg = nativeloader_error_msg;
-    free(nativeloader_error_msg);
+    android::NativeLoaderFreeErrorMessage(nativeloader_error_msg);
     VLOG(jni) << "dlopen(\"" << path << "\", RTLD_NOW) failed: " << *error_msg;
     return false;
   }