commit c7a409036e606a1d0cace8b066ef9a87e61c5b48
author Josh Gao <jmgao@google.com> Tue Mar 19 19:44:00 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 19 19:44:00 2019 +0000
tree 827367615ba62e5c24b1361c80d606b6535b66d9
parent dfb8d7e2e6a691b74ac5ec0a8df4dd2d0d9169b8
parent 99920cb302f1d0f9a81fb226567547955e68c7f1

Merge "adbd: support ro.adb.nonblocking_ffs."

client/adb_client.cpp

diff --git a/client/adb_client.cpp b/client/adb_client.cpp
index 9fa827d..5a7bc8d 100644
--- a/client/adb_client.cpp
+++ b/client/adb_client.cpp
@@ -259,7 +259,7 @@
         if (fd >= 0) {
             std::string version_string;
             if (!ReadProtocolString(fd, &version_string, error)) {
-                return -1;
+                return false;
             }
 
             ReadOrderlyShutdown(fd);

client/commandline.cpp

diff --git a/client/commandline.cpp b/client/commandline.cpp
index bb30ae5..43a3e5e 100644
--- a/client/commandline.cpp
+++ b/client/commandline.cpp
@@ -295,7 +295,10 @@
                     callback->OnStderr(buffer_ptr, length);
                     break;
                 case ShellProtocol::kIdExit:
-                    exit_code = protocol->data()[0];
+                    // data() returns a char* which doesn't have defined signedness.
+                    // Cast to uint8_t to prevent 255 from being sign extended to INT_MIN,
+                    // which doesn't get truncated on Windows.
+                    exit_code = static_cast<uint8_t>(protocol->data()[0]);
                     continue;
                 default:
                     continue;

daemon/usb.cpp

diff --git a/daemon/usb.cpp b/daemon/usb.cpp
index 1eade39..b42236e 100644
--- a/daemon/usb.cpp
+++ b/daemon/usb.cpp
@@ -115,7 +115,7 @@
 };
 
 struct IoBlock {
-    bool pending;
+    bool pending = false;
     struct iocb control;
     std::shared_ptr<Block> payload;