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

Commit c0e46d35 authored by Steven Moreland's avatar Steven Moreland
Browse files

libbinder_ndk: fix null binder parceling segfault. 

Test: runtests.sh
Test: android.binder.cts.NdkBinderTest
Change-Id: I9d3a049fc36ac600ae2f30cf215e2e4c9db9e91b
parent 9496895b

libs/binder/ndk/AParcel.cpp

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ void AParcel_delete(AParcel** parcel) { 
}



binder_status_t AParcel_writeStrongBinder(AParcel* parcel, AIBinder* binder) {

    return (*parcel)->writeStrongBinder(binder->getBinder());

    sp<IBinder> writeBinder = binder != nullptr ? binder->getBinder() : nullptr;

    return (*parcel)->writeStrongBinder(writeBinder);

}

binder_status_t AParcel_readStrongBinder(const AParcel* parcel, AIBinder** binder) {

    sp<IBinder> readBinder = nullptr;