From 1fa946a2f285283277d75bf741bfef05f6bc9d8e Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Thu, 15 Aug 2019 13:27:46 -0700 Subject: [PATCH] Fix android-cloexec-pipe clang-tidy warning The upcoming clang-tidy update finds a new instance of android-cloexec-pipe warning: FileUtilsTests.cpp:72:13: error: prefer pipe2() with O_CLOEXEC to avoid leaking file descriptors to child processes ASSERT_EQ(pipe(pipefd), 0); ^~~~~~~~~~~~ pipe2(pipefd, O_CLOEXEC) Apply the suggested fix by clang-tidy. Test: build Bug: 131328001 Exempt-From-Owner-Approval: Cherrypick Change-Id: Iee772b5c3ed5e2af481e479dab19030f8419290a Merged-In: Iee772b5c3ed5e2af481e479dab19030f8419290a (cherry picked from commit f61e2167d5352b63eb34a086cdcb0dfec485bdf0) --- cmds/idmap2/tests/FileUtilsTests.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmds/idmap2/tests/FileUtilsTests.cpp b/cmds/idmap2/tests/FileUtilsTests.cpp index f4a306e41e32..f55acee029dc 100644 --- a/cmds/idmap2/tests/FileUtilsTests.cpp +++ b/cmds/idmap2/tests/FileUtilsTests.cpp @@ -15,6 +15,7 @@ */ #include +#include #include #include @@ -69,7 +70,7 @@ TEST(FileUtilsTests, FindFilesFindApkFilesRecursive) { TEST(FileUtilsTests, ReadFile) { int pipefd[2]; - ASSERT_EQ(pipe(pipefd), 0); + ASSERT_EQ(pipe2(pipefd, O_CLOEXEC), 0); ASSERT_EQ(write(pipefd[1], "foobar", 6), 6); close(pipefd[1]); -- 2.11.0