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

Commit 2b7c58a1 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "libbinder: readCString: no ubsan sub-overflow"

parents 6e4b17a7 f5e6c7e5

libs/binder/Parcel.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2074,8 +2074,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));