commit 042dfdde7b1346a97b9553b37e4bd7397f32955e
author Paul Crowley <paulcrowley@google.com> Fri Dec 07 18:27:40 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 07 18:27:40 2018 -0800
tree 1ee879dfd86a61fd575a8b29ceb75a94c3e4d91d
parent 62ab2fb83135f1e87f3e00c7c8ab5e534abc9bc3
parent 7748fcf911b1aa333a41a96ea7c5e850efdb36bf

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

Change-Id: Idfb0af866594647a43832d1cbc1b7a597f139144

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 6512556..4ec2679 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";