commit 7748fcf911b1aa333a41a96ea7c5e850efdb36bf
author Paul Crowley <paulcrowley@google.com> Fri Dec 07 18:23:39 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 07 18:23:39 2018 -0800
tree c3ea4eddbdd3aec67a3c51ebda0e9ab2c5498639
parent 938acebc8bd58cabab331066922192cfc3af68f1
parent 1d5d475b514bf7f291fc394b50a1784045d39d07

Merge "Check for errors in dup2" am: b1166633b6
am: 1d5d475b51

Change-Id: I3ec9c4291cad322921a51d34a8ced176abf43de0

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 3bbdf3a..a77b1b6 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -312,7 +312,10 @@
             }
         }
         pipe_read.reset();
-        dup2(pipe_write.get(), STDOUT_FILENO);
+        if (dup2(pipe_write.get(), STDOUT_FILENO) == -1) {
+            PLOG(ERROR) << "dup2 in ForkExecvp";
+            _exit(EXIT_FAILURE);
+        }
         pipe_write.reset();
         execvp(argv[0], const_cast<char**>(argv.data()));
         PLOG(ERROR) << "exec in ForkExecvp";