commit 1d184bee52d3db96abed12662d60ab58215f8c65
author Josh Gao <jmgao@google.com> Thu May 24 11:37:12 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 24 11:37:12 2018 -0700
tree 2c85389646ee5b045a4db8355678a53807fa98ec
parent 74d9ca59b844b597a0047c931f2967ef2a54055c
parent 7ac65573fe0f86316aafa6fb42daa91724432cc0

Merge "adb: fix mac build." am: 925b410c7f
am: d743ebc829

Change-Id: I53ecb37a9351f92ba613a9704dba91b29bb52ab1

adb/adb_unique_fd.h

diff --git a/adb/adb_unique_fd.h b/adb/adb_unique_fd.h
index 7d2354d..d1dc9d1 100644
--- a/adb/adb_unique_fd.h
+++ b/adb/adb_unique_fd.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <errno.h>
 #include <unistd.h>
 
 #include <android-base/unique_fd.h>
@@ -48,14 +49,18 @@
     if (flags & O_CLOEXEC) {
         if (fcntl(pipefd[0], F_SETFD, FD_CLOEXEC) != 0 ||
             fcntl(pipefd[1], F_SETFD, FD_CLOEXEC) != 0) {
-            PLOG(FATAL) << "failed to set FD_CLOEXEC on newly created pipe";
+            close(pipefd[0]);
+            close(pipefd[1]);
+            return false;
         }
     }
 
     if (flags & O_NONBLOCK) {
         if (fcntl(pipefd[0], F_SETFL, O_NONBLOCK) != 0 ||
             fcntl(pipefd[1], F_SETFL, O_NONBLOCK) != 0) {
-            PLOG(FATAL) << "failed to set O_NONBLOCK  on newly created pipe";
+            close(pipefd[0]);
+            close(pipefd[1]);
+            return false;
         }
     }
 #endif