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

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

Merge "libbinder: core parcelables in fuzzer" am: fe81bae6 am: f6ec3766 

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

Change-Id: If83c4bcc185c427644e3660b6d487b5df6360c01
parents 0c1aaf22 f6ec3766

libs/binder/fuzzer/binder.cpp

+17 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include "util.h"



#include <android/os/IServiceManager.h>

#include <binder/ParcelableHolder.h>

#include <binder/PersistableBundle.h>



using ::android::status_t;
@@ -251,5 +253,20 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS { 
    PARCEL_READ_NO_STATUS(uid_t, readCallingWorkSourceUid),

    PARCEL_READ_NO_STATUS(size_t, getBlobAshmemSize),

    PARCEL_READ_NO_STATUS(size_t, getOpenAshmemSize),



    // additional parcelable objects defined in libbinder

    [] (const ::android::Parcel& p, uint8_t data) {

        using ::android::os::ParcelableHolder;

        using ::android::Parcelable;

        FUZZ_LOG() << "about to read ParcelableHolder using readParcelable with status";

        Parcelable::Stability stability = Parcelable::Stability::STABILITY_LOCAL;

        if ( (data & 1) == 1 ) {

            stability = Parcelable::Stability::STABILITY_VINTF;

        }

        ParcelableHolder t = ParcelableHolder(stability);

        status_t status = p.readParcelable(&t);

        FUZZ_LOG() << "ParcelableHolder status: " << status;

    },

    PARCEL_READ_WITH_STATUS(android::os::PersistableBundle, readParcelable),

};

// clang-format on