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

Commit 1b46ad15 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't process objects with empty name" into nyc-mr1-dev

parents 9c6c7f37 7ea72dcd

media/mtp/MtpServer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -927,6 +927,10 @@ MtpResponseCode MtpServer::doSendObjectInfo() { 
    if (!mData.getUInt32(temp32)) return MTP_RESPONSE_INVALID_PARAMETER;  // sequence number

    MtpStringBuffer name, created, modified;

    if (!mData.getString(name)) return MTP_RESPONSE_INVALID_PARAMETER;    // file name

    if (name.getCharCount() == 0) {

        ALOGE("empty name");

        return MTP_RESPONSE_INVALID_PARAMETER;

    }

    if (!mData.getString(created)) return MTP_RESPONSE_INVALID_PARAMETER;      // date created

    if (!mData.getString(modified)) return MTP_RESPONSE_INVALID_PARAMETER;     // date modified

    // keywords follow