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

Commit 90f5d75c authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MtpDevice: Handle zero length packets in readResponse() 



Bug: 3509060

Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent e976ff4a

media/mtp/MtpDevice.cpp

+4 −0
Original line number Diff line number Diff line
@@ -819,6 +819,10 @@ MtpResponseCode MtpDevice::readResponse() { 
        return mResponse.getResponseCode();

    }

    int ret = mResponse.read(mRequestIn1);

    // handle zero length packets, which might occur if the data transfer

    // ends on a packet boundary

    if (ret == 0)

        ret = mResponse.read(mRequestIn1);

    if (ret >= MTP_CONTAINER_HEADER_SIZE) {

        mResponse.dump();

        return mResponse.getResponseCode();