commit 6e288634425a7e8f8481e22beb68e4d90ed792f9
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 16 23:03:17 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 16 23:03:17 2019 +0000
tree 78788d75af840620df2d7a37e0a4a5ae4a68da31
parent e438843ead29103e9142149243695e50dc3734da
parent 8efadf70e10fcc12e227e98e838e7544fc26256c

Merge "Handle failed usb/reads and writes correctly"

fastboot/device/usb_client.cpp

diff --git a/fastboot/device/usb_client.cpp b/fastboot/device/usb_client.cpp
index fb51a90..511bd5c 100644
--- a/fastboot/device/usb_client.cpp
+++ b/fastboot/device/usb_client.cpp
@@ -257,7 +257,7 @@
         auto bytes_to_read = std::min(len - bytes_read_total, kFbFfsNumBufs * kFbFfsBufSize);
         auto bytes_read_now = handle_->read(handle_.get(), char_data, bytes_to_read);
         if (bytes_read_now < 0) {
-            return bytes_read_total;
+            return bytes_read_total == 0 ? -1 : bytes_read_total;
         }
         bytes_read_total += bytes_read_now;
         char_data += bytes_read_now;
@@ -278,7 +278,7 @@
         auto bytes_to_write = std::min(len - bytes_written_total, kFbFfsNumBufs * kFbFfsBufSize);
         auto bytes_written_now = handle_->write(handle_.get(), data, bytes_to_write);
         if (bytes_written_now < 0) {
-            return bytes_written_total;
+            return bytes_written_total == 0 ? -1 : bytes_written_total;
         }
         bytes_written_total += bytes_written_now;
         char_data += bytes_written_now;