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

Commit 10308535 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449,... 

Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449, 7995789, 7995790, 7995450, 7996029, 7996030, 7996139, 7996140, 7996141, 7996142, 7996143, 7996144, 7995544, 7995545, 7995546, 7995547, 7995548, 7995549, 7995550, 7996145, 7996146, 7996032, 7996147, 7996148, 7996149, 7996150, 7994747, 7994748, 7995451, 7994749, 7994750, 7995966, 7995967, 7994751, 7996151, 7996152, 7996153] into pi-qpr3-b-release

Change-Id: Ib4908a4a2f5e53932bb32d27ea3411ef6f85224e
parents 2062c5a4 0038364e

libs/binder/Parcel.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2013,8 +2013,8 @@ status_t Parcel::readUtf8FromUtf16(std::unique_ptr<std::string>* str) const { 


const char* Parcel::readCString() const

{

    if (mDataPos < mDataSize) {

        const size_t avail = mDataSize-mDataPos;

    if (avail > 0) {

        const char* str = reinterpret_cast<const char*>(mData+mDataPos);

        // is the string's trailing NUL within the parcel's valid bounds?

        const char* eos = reinterpret_cast<const char*>(memchr(str, 0, avail));

libs/binder/Status.cpp

+29 −2
Original line number Diff line number Diff line
@@ -76,13 +76,23 @@ status_t Status::readFromParcel(const Parcel& parcel) { 
    // Skip over fat response headers.  Not used (or propagated) in native code.

    if (mException == EX_HAS_REPLY_HEADER) {

        // Note that the header size includes the 4 byte size field.

        const int32_t header_start = parcel.dataPosition();

        const size_t header_start = parcel.dataPosition();

        // Get available size before reading more

        const size_t header_avail = parcel.dataAvail();



        int32_t header_size;

        status = parcel.readInt32(&header_size);

        if (status != OK) {

            setFromStatusT(status);

            return status;

        }



        if (header_size < 0 || static_cast<size_t>(header_size) > header_avail) {

            android_errorWriteLog(0x534e4554, "132650049");

            setFromStatusT(UNKNOWN_ERROR);

            return UNKNOWN_ERROR;

        }



        parcel.setDataPosition(header_start + header_size);

        // And fat response headers are currently only used when there are no

        // exceptions, so act like there was no error.
@@ -109,19 +119,36 @@ status_t Status::readFromParcel(const Parcel& parcel) { 
        setFromStatusT(status);

        return status;

    }

    if (remote_stack_trace_header_size < 0 ||

        static_cast<size_t>(remote_stack_trace_header_size) > parcel.dataAvail()) {



        android_errorWriteLog(0x534e4554, "132650049");

        setFromStatusT(UNKNOWN_ERROR);

        return UNKNOWN_ERROR;

    }

    parcel.setDataPosition(parcel.dataPosition() + remote_stack_trace_header_size);



    if (mException == EX_SERVICE_SPECIFIC) {

        status = parcel.readInt32(&mErrorCode);

    } else if (mException == EX_PARCELABLE) {

        // Skip over the blob of Parcelable data

        const int32_t header_start = parcel.dataPosition();

        const size_t header_start = parcel.dataPosition();

        // Get available size before reading more

        const size_t header_avail = parcel.dataAvail();



        int32_t header_size;

        status = parcel.readInt32(&header_size);

        if (status != OK) {

            setFromStatusT(status);

            return status;

        }



        if (header_size < 0 || static_cast<size_t>(header_size) > header_avail) {

            android_errorWriteLog(0x534e4554, "132650049");

            setFromStatusT(UNKNOWN_ERROR);

            return UNKNOWN_ERROR;

        }



        parcel.setDataPosition(header_start + header_size);

    }

    if (status != OK) {