commit 6e1a2e4c67ebd69bdd0836c41395c1517211687b
author Nick Kralevich <nnk@google.com> Tue Dec 18 15:06:48 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 18 15:06:48 2018 -0800
tree 2e65e009887772374e69a5f177dcfbe4b80be2e2
parent b65a38b4a196af48c827bb07b8477fc77afc305a
parent 8795883d5d52c92ddacd2f6d36cda98964ddb085

Merge "zip_archive.cc: add O_CLOEXEC"
am: 958a669e58

Change-Id: I25fe481e753ae5419e79fd9e184635f9513815b1

libziparchive/zip_archive.cc

diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index 9eb7f2c..6b9f6e1 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -491,7 +491,7 @@
 }
 
 int32_t OpenArchive(const char* fileName, ZipArchiveHandle* handle) {
-  const int fd = ::android::base::utf8::open(fileName, O_RDONLY | O_BINARY, 0);
+  const int fd = ::android::base::utf8::open(fileName, O_RDONLY | O_BINARY | O_CLOEXEC, 0);
   ZipArchive* archive = new ZipArchive(fd, true);
   *handle = archive;