commit f5b0f2cef8554efaa90adc6a1ae04c2b533970ed
author Brian Carlstrom <bdc@google.com> Fri Oct 14 01:04:26 2016 -0700
committer Brian Carlstrom <bdc@google.com> Fri Oct 14 16:52:42 2016 -0700
tree 431874a41548ba5d18598a5b1b520de042e012a9
parent 4c91f05a9ad59759760fb8c1543684dfdb9ab7dc

Ensure OpenDexFilesFromImage closes file to prevent file descriptor leak

(cherry picked from commit 645e477c2ce7a59ac98bc86463826cf082a13ad8)

Test: m -j32 test-art-host
Bug: 32095919
Change-Id: I44541edeb403a508e1b9794ee09fb1f55e3f42bf

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 9c0d2db..9024aaa 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -829,7 +829,7 @@
     if (file.get() == nullptr) {
       return false;
     }
-    std::unique_ptr<ElfFile> elf_file(ElfFile::Open(file.release(),
+    std::unique_ptr<ElfFile> elf_file(ElfFile::Open(file.get(),
                                                     false /* writable */,
                                                     false /* program_header_only */,
                                                     false /* low_4gb */,