commit c86c1e929dc829091e491181c7e5dcf594ce7c71
author Yabin Cui <yabinc@google.com> Wed Sep 09 17:57:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 09 17:57:34 2015 +0000
tree 7a2be08cf073e791124bac43f8bf574647078f66
parent dc00610496d39b7a782e4b595e1fa284bd945f77
parent dfb72f5b9da6bd56f44d3445e50c5e0db785e482

am 0df24ea2: Merge "adb: refactor _is_valid_ack_reply_fd"

* commit '0df24ea234fcfb9ac57ed94701868426a41d8642':
  adb: refactor _is_valid_ack_reply_fd

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 682be49..db2c90a 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -939,6 +939,18 @@
     return 0;
 }
 
+// Disallow stdin, stdout, and stderr.
+static bool _is_valid_ack_reply_fd(const int ack_reply_fd) {
+#ifdef _WIN32
+    const HANDLE ack_reply_handle = cast_int_to_handle(ack_reply_fd);
+    return (GetStdHandle(STD_INPUT_HANDLE) != ack_reply_handle) &&
+           (GetStdHandle(STD_OUTPUT_HANDLE) != ack_reply_handle) &&
+           (GetStdHandle(STD_ERROR_HANDLE) != ack_reply_handle);
+#else
+    return ack_reply_fd > 2;
+#endif
+}
+
 int adb_commandline(int argc, const char **argv) {
     int no_daemon = 0;
     int is_daemon = 0;
@@ -988,14 +1000,7 @@
             argc--;
             argv++;
             ack_reply_fd = strtol(reply_fd_str, nullptr, 10);
-#ifdef _WIN32
-            const HANDLE ack_reply_handle = cast_int_to_handle(ack_reply_fd);
-            if ((GetStdHandle(STD_INPUT_HANDLE) == ack_reply_handle) ||
-                (GetStdHandle(STD_OUTPUT_HANDLE) == ack_reply_handle) ||
-                (GetStdHandle(STD_ERROR_HANDLE) == ack_reply_handle)) {
-#else
-            if (ack_reply_fd <= 2) { // Disallow stdin, stdout, and stderr.
-#endif
+            if (!_is_valid_ack_reply_fd(ack_reply_fd)) {
                 fprintf(stderr, "adb: invalid reply fd \"%s\"\n", reply_fd_str);
                 return usage();
             }