diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-02 02:10:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-10-02 02:10:49 +0000 |
| commit | f11b01fc87dd0c84f1ff460f19fe1caf78097100 (patch) | |
| tree | 0b612fef318911b80ec31d8bae2204b0becf66ea | |
| parent | 46ef208603e02ab7cefab6402abfce97456391e7 (diff) | |
| parent | f7451e6782680cc1eb4fc1ea70806307800c3124 (diff) | |
| download | core-f11b01fc87dd0c84f1ff460f19fe1caf78097100.tar.gz | |
Merge "adbd: Fix check against valid payload size" into rvc-qpr-dev
| -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 a66387193..50d73644d 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()) { |