Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51a73f34 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

Merge "adbd: Fix check against valid payload size" am: 596f3b53 am:... 

Merge "adbd: Fix check against valid payload size" am: 596f3b53 am: 9a804947 am: aeb5be6f am: 74246334

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428117

Change-Id: I4a55276fb0b501569c65e59c9e72bde3577a2e21
parents dfa0450d 74246334

adb/daemon/usb.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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()) {