commit 558bbcd368e4280313bbbc2720b75eb86a549f63
author Nick Kralevich <nnk@google.com> Tue Dec 18 15:10:03 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 18 15:10:03 2018 -0800
tree e5409789bff0bdbb29fda376bd7bc75f6751de64
parent 696324adc8130b495393d8cda37715c7d4f8ce78
parent 6e1a2e4c67ebd69bdd0836c41395c1517211687b

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

Change-Id: I6d0e6f9fdc9140cd2cae840e1bd2212863a3b623

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;