[Android] Fix port leak in the forwarder.

tools/android/forwarder2/host_forwarder_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <errno.h>
 #include <signal.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ skipping 301 matching lines @@
     // - Remove from "adb forward" command.
     LOG(INFO) << "Device " << device_serial << " has no more ports.";
     device_serial_to_adb_port_map_.erase(device_serial);
     const std::string serial_part = device_serial.empty() ?
         std::string() : std::string("-s ") + device_serial;
     const std::string command = base::StringPrintf(
         "%s %s forward --remove tcp:%d",
         adb_path.c_str(),
         serial_part.c_str(),
         port);
-    const base::CommandLine command_line(base::SplitString(
-        command, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY));
-    int ret;
+    const std::vector<std::string> split_command = base::SplitString(

[Ted C, 2017/03/08 04:55:05]

maybe a comment here about the need for it to be ordered so using the vector
variant here (I could see an unsuspecting person trying to unify all
GetAppOutput*s and not seeing the difference here.

[jbudorick, 2017/03/08 05:37:40]

Done.

+        command, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     std::string output;
-    base::GetAppOutputWithExitCode(command_line, &output, &ret);
-    LOG(INFO) << command << " ret: " << ret << " output: " << output;
+    if (!base::GetAppOutputAndError(split_command, &output)) {
+      LOG(ERROR) << command << " failed. output: " << output;
+    } else {
+      LOG(INFO) << command;
+    }
     // Wait for the socket to be fully unmapped.
     const std::string port_mapped_cmd = base::StringPrintf(
         "lsof -nPi:%d",
         port);
-    const base::CommandLine port_mapped_cmd_line(
-        base::SplitString(port_mapped_cmd, " ", base::TRIM_WHITESPACE,
-                          base::SPLIT_WANT_NONEMPTY));
+    const std::vector<std::string> port_mapped_split_cmd = base::SplitString(
+        port_mapped_cmd, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     const int poll_interval_us = 500 * 1000;
     int retries = 3;
     while (retries) {
-      int port_unmapped;
-      base::GetAppOutputWithExitCode(port_mapped_cmd_line, &output,
-                                     &port_unmapped);
-      LOG(INFO) << "Device " << device_serial << " port " << port << " unmap "
-                << port_unmapped;
+      // lsof failure means the port was successfully unmapped.
+      bool port_unmapped =
+          !base::GetAppOutputAndError(port_mapped_split_cmd, &output);
+      LOG(INFO) << "Device " << device_serial << " port " << port
+                << (port_unmapped ? "" : " not") << " unmapped";
       if (port_unmapped)
         break;
       --retries;
       usleep(poll_interval_us);
     }
   }
 
   int GetAdbPortForDevice(const std::string adb_path,
                           const std::string& device_serial) {
     base::hash_map<std::string, int>::const_iterator it =
         device_serial_to_adb_port_map_.find(device_serial);
     if (it != device_serial_to_adb_port_map_.end())
       return it->second;
     Socket bind_socket;
     CHECK(bind_socket.BindTcp("127.0.0.1", 0));
     const int port = bind_socket.GetPort();
     bind_socket.Close();
     const std::string serial_part = device_serial.empty() ?
         std::string() : std::string("-s ") + device_serial;
     const std::string command = base::StringPrintf(
         "%s %s forward tcp:%d localabstract:chrome_device_forwarder",
         adb_path.c_str(),
         serial_part.c_str(),
         port);
-    const base::CommandLine command_line(base::SplitString(
-        command, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY));
-    int ret;
+    const std::vector<std::string> split_command = base::SplitString(
+        command, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     std::string output;
-    base::GetAppOutputWithExitCode(command_line, &output, &ret);
-    LOG(INFO) << command << " ret: " << ret << " output: " << output;
-    if (ret < 0 || !WIFEXITED(ret) || WEXITSTATUS(ret) != 0)
+    bool success = base::GetAppOutputAndError(split_command, &output);
+    if (!success) {
+      LOG(ERROR) << command << " failed. output: " << output;
       return -1;
+    }
+    LOG(INFO) << command;
     device_serial_to_adb_port_map_[device_serial] = port;
     return port;
   }
 
   bool SendMessage(const std::string& msg, Socket* client_socket) {
     bool result = client_socket->WriteString(msg);
     DCHECK(result);
     if (!result)
       has_failed_ = true;
     return result;
@@ skipping 175 matching lines @@
 
   return client_delegate.has_failed() || daemon_delegate.has_failed();
 }
 
 }  // namespace
 }  // namespace forwarder2
 
 int main(int argc, char** argv) {
   return forwarder2::RunHostForwarder(argc, argv);
 }