commit f11b01fc87dd0c84f1ff460f19fe1caf78097100
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Oct 02 02:10:49 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 02 02:10:49 2020 +0000
tree 0b612fef318911b80ec31d8bae2204b0becf66ea
parent 46ef208603e02ab7cefab6402abfce97456391e7
parent f7451e6782680cc1eb4fc1ea70806307800c3124

Merge "adbd: Fix check against valid payload size" into rvc-qpr-dev

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index a663871..50d7364 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -584,12 +584,11 @@
                 incoming_header_ = msg;
             } else {
                 size_t bytes_left = incoming_header_->data_length - incoming_payload_.size();
-                Block payload = std::move(block->payload);
                 if (block->payload.size() > bytes_left) {
                     HandleError("received too many bytes while waiting for payload");
                     return false;
                 }
-                incoming_payload_.append(std::move(payload));
+                incoming_payload_.append(std::move(block->payload));
             }
 
             if (incoming_header_->data_length == incoming_payload_.size()) {