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

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

Merge "Make MemoryDealer::deallocate private" am: cdb2c8f3 am: ebae424d am: 0afddfe2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1843873

Change-Id: I6d82642f3d6ddd60792a7cd604cfe7115bde9004
parents 8cda8120 0afddfe2

libs/binder/include/binder/MemoryDealer.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ public: 
            uint32_t flags = 0 /* or bits such as MemoryHeapBase::READ_ONLY */ );

            uint32_t flags = 0 /* or bits such as MemoryHeapBase::READ_ONLY */ );





    virtual sp<IMemory> allocate(size_t size);

    virtual sp<IMemory> allocate(size_t size);

    virtual void        deallocate(size_t offset);

    virtual void        dump(const char* what) const;

    virtual void        dump(const char* what) const;





    // allocations are aligned to some value. return that value so clients can account for it.

    // allocations are aligned to some value. return that value so clients can account for it.
@@ -48,6 +47,8 @@ protected: 
    virtual ~MemoryDealer();

    virtual ~MemoryDealer();





private:

private:

    friend class Allocation;

    virtual void                deallocate(size_t offset);

    const sp<IMemoryHeap>&      heap() const;

    const sp<IMemoryHeap>&      heap() const;

    SimpleBestFitAllocator*     allocator() const;

    SimpleBestFitAllocator*     allocator() const;

libs/binder/tests/unit_fuzzers/MemoryDealerFuzz.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -45,15 +45,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { 
        fdp.PickValueInArray<std::function<void()>>({

        fdp.PickValueInArray<std::function<void()>>({

                [&]() -> void { dealer->getAllocationAlignment(); },

                [&]() -> void { dealer->getAllocationAlignment(); },

                [&]() -> void { dealer->getMemoryHeap(); },

                [&]() -> void { dealer->getMemoryHeap(); },

                [&]() -> void {

                    size_t offset = fdp.ConsumeIntegral<size_t>();



                    // Offset has already been freed, so return instead.

                    if (free_list.find(offset) != free_list.end()) return;



                    dealer->deallocate(offset);

                    free_list.insert(offset);

                },

                [&]() -> void {

                [&]() -> void {

                    std::string randString = fdp.ConsumeRandomLengthString(fdp.remaining_bytes());

                    std::string randString = fdp.ConsumeRandomLengthString(fdp.remaining_bytes());

                    dealer->dump(randString.c_str());

                    dealer->dump(randString.c_str());