diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-09-04 17:15:11 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-10-03 17:00:39 -0700 |
| commit | 7c3d13aebdd8611cae58a1048bffb13cbdc465cb (patch) | |
| tree | 23f2415bb38e77b0d53c1de06c37a133c7b08e51 /runtime/zip_archive.cc | |
| parent | f15242943a7a836966cd521e3095a4b731695c71 (diff) | |
| download | art-7c3d13aebdd8611cae58a1048bffb13cbdc465cb.tar.gz art-7c3d13aebdd8611cae58a1048bffb13cbdc465cb.tar.bz2 art-7c3d13aebdd8611cae58a1048bffb13cbdc465cb.zip | |
Use file magic to determine file type, not file extension.
Bug: 10614658
Change-Id: I9156dfca78ac8cd1c62fb258825cc791629270a4
Diffstat (limited to 'runtime/zip_archive.cc')
| -rw-r--r-- | runtime/zip_archive.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/zip_archive.cc b/runtime/zip_archive.cc index c3167e5736..8e09e783ed 100644 --- a/runtime/zip_archive.cc +++ b/runtime/zip_archive.cc @@ -336,11 +336,11 @@ ZipArchive* ZipArchive::Open(const std::string& filename) { 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; |