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

Commit 4c4e2aa6 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: warn on null binder read" am: dba92c2a 

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

Change-Id: I2084f5d52bd245301de91df46e99e9ef32e68be6
parents 810aee7e dba92c2a

libs/binder/Parcel.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -1862,6 +1862,7 @@ status_t Parcel::readStrongBinder(sp<IBinder>* val) const 
{

{

    status_t status = readNullableStrongBinder(val);

    status_t status = readNullableStrongBinder(val);

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

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

        ALOGW("Expecting binder but got null!");

        status = UNEXPECTED_NULL;

        status = UNEXPECTED_NULL;

    }

    }

    return status;

    return status;