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

Commit b91a4f17 authored by Jon Bottarini's avatar Jon Bottarini Committed by Gerrit Code Review
Browse files

Merge "mtp_host_property_fuzzer: Bug Fix"

parents 61c04107 6c57264e

media/mtp/tests/MtpFuzzer/mtp_property_fuzzer.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -33,7 +33,11 @@ constexpr uint16_t kFeasibleTypes[] = { 




class MtpPropertyFuzzer : MtpPacketFuzzerUtils {

class MtpPropertyFuzzer : MtpPacketFuzzerUtils {

  public:

  public:

    MtpPropertyFuzzer(const uint8_t* data, size_t size) : mFdp(data, size){};

    MtpPropertyFuzzer(const uint8_t* data, size_t size) : mFdp(data, size) {

        mUsbDevFsUrb = (struct usbdevfs_urb*)malloc(sizeof(struct usbdevfs_urb) +

                                                    sizeof(struct usbdevfs_iso_packet_desc));

    };

    ~MtpPropertyFuzzer() { free(mUsbDevFsUrb); };

    void process();

    void process();





  private:

  private:
@@ -41,7 +45,7 @@ class MtpPropertyFuzzer : MtpPacketFuzzerUtils { 
};

};





void MtpPropertyFuzzer::process() {

void MtpPropertyFuzzer::process() {

    MtpProperty* mtpProperty;

    MtpProperty* mtpProperty = nullptr;

    if (mFdp.ConsumeBool()) {

    if (mFdp.ConsumeBool()) {

        mtpProperty = new MtpProperty();

        mtpProperty = new MtpProperty();

    } else {

    } else {
@@ -75,6 +79,7 @@ void MtpPropertyFuzzer::process() { 
                            fillFilePath(&mFdp);

                            fillFilePath(&mFdp);

                            int32_t fd = memfd_create(mPath.c_str(), MFD_ALLOW_SEALING);

                            int32_t fd = memfd_create(mPath.c_str(), MFD_ALLOW_SEALING);

                            fillUsbRequest(fd, &mFdp);

                            fillUsbRequest(fd, &mFdp);

                            mUsbRequest.dev = usb_device_new(mPath.c_str(), fd);

                            mtpDataPacket.write(&mUsbRequest,

                            mtpDataPacket.write(&mUsbRequest,

                                                mFdp.PickValueInArray<UrbPacketDivisionMode>(

                                                mFdp.PickValueInArray<UrbPacketDivisionMode>(

                                                        kUrbPacketDivisionModes),

                                                        kUrbPacketDivisionModes),