diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-22 01:04:47 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-22 01:04:47 +0000 |
| commit | 07da083e6bf36dd4be64a85b3461623d2488476d (patch) | |
| tree | fc21546830650c084339a9892ea0aee2569408f7 /adb/daemon/usb.cpp | |
| parent | 79c5fee02e1430bec2f75956297f5b631e70b407 (diff) | |
| parent | fb16db72d227d373b0ef8cc04c7efb6091f6cc68 (diff) | |
Snap for 6852218 from fb16db72d227d373b0ef8cc04c7efb6091f6cc68 to sc-release
Change-Id: Iae251c05f967d42661cc2d19a0fac485c7972cf4
Diffstat (limited to 'adb/daemon/usb.cpp')
| -rw-r--r-- | adb/daemon/usb.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp index a663871931..50d73644d4 100644 --- a/adb/daemon/usb.cpp +++ b/adb/daemon/usb.cpp @@ -584,12 +584,11 @@ struct UsbFfsConnection : public Connection { 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()) { |