summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-12-18 22:49:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-12-18 22:49:32 +0000
commit958a669e58ebd9ac6eed1e9423c020cb23a4a746 (patch)
tree2e65e009887772374e69a5f177dcfbe4b80be2e2
parent96b8ce7228da18dd8fe41134079d119e8b964891 (diff)
parent3bdf744a550b5c29c4f02a279d3376a9ebe1b053 (diff)
downloadsystem_core-958a669e58ebd9ac6eed1e9423c020cb23a4a746.tar.gz
system_core-958a669e58ebd9ac6eed1e9423c020cb23a4a746.tar.bz2
system_core-958a669e58ebd9ac6eed1e9423c020cb23a4a746.zip
Merge "zip_archive.cc: add O_CLOEXEC"
-rw-r--r--libziparchive/zip_archive.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index 9eb7f2cc9..6b9f6e165 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -491,7 +491,7 @@ int32_t OpenArchiveFd(int fd, const char* debug_file_name, ZipArchiveHandle* han
}
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;