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

Commit b93ec309 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "mtp_fuzzer: Bug fix" into main am: 89721cc5 am: 7748dac9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2917226



Change-Id: Ie8e336be963386682f3a5ea0ac8df871a9457e2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a04b9de 7748dac9

media/mtp/tests/MtpFuzzer/MtpMockHandle.h

+3 −3
Original line number Diff line number Diff line
@@ -45,18 +45,18 @@ public: 
                  pkt.size());



            // packet is bigger than what the caller can handle,

            if (pkt.size() > len) {

            if (pkt.size() - mPacketOffset > len) {

                memcpy(data, pkt.data() + mPacketOffset, len);



                mPacketOffset += len;

                readAmt = len;

                // packet is equal or smaller than the caller buffer

            } else {

                memcpy(data, pkt.data() + mPacketOffset, pkt.size());

                memcpy(data, pkt.data() + mPacketOffset, pkt.size() - mPacketOffset);



                mPacketNumber++;

                mPacketOffset = 0;

                readAmt = pkt.size();

                readAmt = pkt.size() - mPacketOffset;

            }



            return readAmt;