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

Commit bb34bd19 authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Check for null data buffer in AParcel_marshal" am: eec41c20 am: 528641b0 

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



Change-Id: I758f9a715b9e9f2f720be47482ec43bfff372c2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 46d109ec 528641b0

libs/binder/ndk/parcel.cpp

+3 −0
Original line number Diff line number Diff line
@@ -700,6 +700,9 @@ binder_status_t AParcel_marshal(const AParcel* parcel, uint8_t* buffer, size_t s 
        return STATUS_BAD_VALUE;

    }

    const uint8_t* internalBuffer = parcel->get()->data();

    if (internalBuffer == nullptr) {

        return STATUS_UNEXPECTED_NULL;

    }

    memcpy(buffer, internalBuffer + start, len);

    return STATUS_OK;

}