commit 7c3d13aebdd8611cae58a1048bffb13cbdc465cb
author Brian Carlstrom <bdc@google.com> Wed Sep 04 17:15:11 2013 -0700
committer Brian Carlstrom <bdc@google.com> Thu Oct 03 17:00:39 2013 -0700
tree 23f2415bb38e77b0d53c1de06c37a133c7b08e51
parent f15242943a7a836966cd521e3095a4b731695c71

Use file magic to determine file type, not file extension.

Bug: 10614658
Change-Id: I9156dfca78ac8cd1c62fb258825cc791629270a4

runtime/zip_archive.cc

diff --git a/runtime/zip_archive.cc b/runtime/zip_archive.cc
index c3167e5..8e09e78 100644
--- a/runtime/zip_archive.cc
+++ b/runtime/zip_archive.cc
@@ -336,11 +336,11 @@
     PLOG(WARNING) << "Unable to open '" << filename << "'";
     return NULL;
   }
-  SetCloseOnExec(fd);
   return OpenFromFd(fd);
 }
 
 ZipArchive* ZipArchive::OpenFromFd(int fd) {
+  SetCloseOnExec(fd);
   UniquePtr<ZipArchive> zip_archive(new ZipArchive(fd));
   if (zip_archive.get() == NULL) {
       return NULL;