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

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

Merge "Handle NULL result of strdup."

parents d82bd98d 96a84081

media/mtp/MtpDeviceInfo.cpp

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ bool MtpDeviceInfo::read(MtpDataPacket& packet) { 


    if (!packet.getString(string)) return false;

    mVendorExtensionDesc = strdup((const char *)string);

    if (!mVendorExtensionDesc) return false;



    if (!packet.getUInt16(mFunctionalMode)) return false;

    mOperations = packet.getAUInt16();
@@ -84,12 +85,16 @@ bool MtpDeviceInfo::read(MtpDataPacket& packet) { 


    if (!packet.getString(string)) return false;

    mManufacturer = strdup((const char *)string);

    if (!mManufacturer) return false;

    if (!packet.getString(string)) return false;

    mModel = strdup((const char *)string);

    if (!mModel) return false;

    if (!packet.getString(string)) return false;

    mVersion = strdup((const char *)string);

    if (!mVersion) return false;

    if (!packet.getString(string)) return false;

    mSerial = strdup((const char *)string);

    if (!mSerial) return false;



    return true;

}

media/mtp/MtpObjectInfo.cpp

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ bool MtpObjectInfo::read(MtpDataPacket& packet) { 


    if (!packet.getString(string)) return false;

    mName = strdup((const char *)string);

    if (!mName) return false;



    if (!packet.getString(string)) return false;

    if (parseDateTime((const char*)string, time))
@@ -88,6 +89,7 @@ bool MtpObjectInfo::read(MtpDataPacket& packet) { 


    if (!packet.getString(string)) return false;

    mKeywords = strdup((const char *)string);

    if (!mKeywords) return false;



    return true;

}

media/mtp/MtpStorageInfo.cpp

+2 −0
Original line number Diff line number Diff line
@@ -58,8 +58,10 @@ bool MtpStorageInfo::read(MtpDataPacket& packet) { 


    if (!packet.getString(string)) return false;

    mStorageDescription = strdup((const char *)string);

    if (!mStorageDescription) return false;

    if (!packet.getString(string)) return false;

    mVolumeIdentifier = strdup((const char *)string);

    if (!mVolumeIdentifier) return false;



    return true;

}