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

Commit 2e86c337 authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

Merge "libbinder: Make null handling explicit for strong binders" am: b5f08e43 

am: be5b932d

* commit 'be5b932d':
  libbinder: Make null handling explicit for strong binders
parents ded6b52f be5b932d

include/binder/Parcel.h

+18 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ public: 
    const char16_t*     readString16Inplace(size_t* outLen) const;

    sp<IBinder>         readStrongBinder() const;

    status_t            readStrongBinder(sp<IBinder>* val) const;

    status_t            readNullableStrongBinder(sp<IBinder>* val) const;

    wp<IBinder>         readWeakBinder() const;



    template<typename T>
@@ -268,6 +269,9 @@ public: 
    template<typename T>

    status_t            readStrongBinder(sp<T>* val) const;



    template<typename T>

    status_t            readNullableStrongBinder(sp<T>* val) const;



    status_t            readStrongBinderVector(std::unique_ptr<std::vector<sp<IBinder>>>* val) const;

    status_t            readStrongBinderVector(std::vector<sp<IBinder>>* val) const;
@@ -574,6 +578,20 @@ status_t Parcel::readStrongBinder(sp<T>* val) const { 
    return ret;

}



template<typename T>

status_t Parcel::readNullableStrongBinder(sp<T>* val) const {

    sp<IBinder> tmp;

    status_t ret = readNullableStrongBinder(&tmp);



    if (ret == OK) {

        *val = interface_cast<T>(tmp);



        if (val->get() == nullptr) {

            return UNKNOWN_ERROR;

        }

    }

}



template<typename T, typename U>

status_t Parcel::unsafeReadTypedVector(

        std::vector<T>* val,

libs/binder/Parcel.cpp

+14 −2
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ status_t Parcel::writeStrongBinderVector(const std::unique_ptr<std::vector<sp<IB 
}



status_t Parcel::readStrongBinderVector(std::unique_ptr<std::vector<sp<IBinder>>>* val) const {

    return readNullableTypedVector(val, &Parcel::readStrongBinder);

    return readNullableTypedVector(val, &Parcel::readNullableStrongBinder);

}



status_t Parcel::readStrongBinderVector(std::vector<sp<IBinder>>* val) const {
@@ -1904,6 +1904,15 @@ const char16_t* Parcel::readString16Inplace(size_t* outLen) const 
}



status_t Parcel::readStrongBinder(sp<IBinder>* val) const

{

    status_t status = readNullableStrongBinder(val);

    if (status == OK && !val->get()) {

        status = UNEXPECTED_NULL;

    }

    return status;

}



status_t Parcel::readNullableStrongBinder(sp<IBinder>* val) const

{

    return unflatten_binder(ProcessState::self(), *this, val);

}
@@ -1911,7 +1920,10 @@ status_t Parcel::readStrongBinder(sp<IBinder>* val) const 
sp<IBinder> Parcel::readStrongBinder() const

{

    sp<IBinder> val;

    readStrongBinder(&val);

    // Note that a lot of code in Android reads binders by hand with this

    // method, and that code has historically been ok with getting nullptr

    // back (while ignoring error codes).

    readNullableStrongBinder(&val);

    return val;

}