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

Commit a7134ad5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] libbinder: readCString: no ubsan sub-overflow am: d0d4b584 

Change-Id: I6777e3363ce68f4a68916d2f289c7d1161007081
parents 9a7bf9f1 d0d4b584

libs/binder/Parcel.cpp

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




const char* Parcel::readCString() const

const char* Parcel::readCString() const

{

{

    if (mDataPos < mDataSize) {

        const size_t avail = mDataSize-mDataPos;

        const size_t avail = mDataSize-mDataPos;

    if (avail > 0) {

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

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

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

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

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

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