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

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

Merge "mtp_device_fuzzer: Bug Fix" am: 7d7cd6b0 am: 2150a6ae am:... 

Merge "mtp_device_fuzzer: Bug Fix" am: 7d7cd6b0 am: 2150a6ae am: d44bc135 am: 3acca984 am: 79256305

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



Change-Id: Ie0d2d84d94d519f9b683bff0dc624c9568ae9f57
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84f71e7e 79256305

media/mtp/tests/MtpFuzzer/mtp_device_fuzzer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { 
    usb_device* device = usb_device_new(deviceName.c_str(), fd);

    MtpDevice mtpDevice(device, fdp.ConsumeIntegral<int32_t>(), &descriptor.ep[0],

                        &descriptor.ep[1], &descriptor.ep[2]);

    MtpObjectInfo objectinfo(fdp.ConsumeIntegral<uint32_t>());

    MtpStorageInfo storageInfo(fdp.ConsumeIntegral<uint32_t>());

    while (fdp.remaining_bytes()) {

        auto mtpDeviceFunction = fdp.PickValueInArray<const std::function<void()>>(

                {[&]() { mtpDevice.getStorageIDs(); },
@@ -190,6 +188,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { 
                 },

                 [&]() { MtpDevice::open(deviceName.c_str(), fd); },

                 [&]() {

                     MtpObjectInfo objectinfo(fdp.ConsumeIntegral<uint32_t>() /* handle */);

                     MtpDataPacket mtpDataPacket;

                     MtpDevHandle devHandle;

                     std::vector<uint8_t> packet = fdp.ConsumeBytes<uint8_t>(kMaxBytes);
@@ -198,6 +197,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { 
                     objectinfo.print();

                 },

                 [&]() {

                     MtpStorageInfo storageInfo(fdp.ConsumeIntegral<uint32_t>() /* id */);

                     MtpDataPacket mtpDataPacket;

                     MtpDevHandle devHandle;

                     std::vector<uint8_t> packet = fdp.ConsumeBytes<uint8_t>(kMaxBytes);