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

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

libbinder: check null bytes in readString*Inplace am: 58f5cfa5 am: 776ca083 am: 398f3df9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38ad53fceddfe8dd6b2d536ed0d4d86ebfad35e1
parents 7698f43e 398f3df9

libs/binder/Parcel.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2058,7 +2058,7 @@ const char* Parcel::readString8Inplace(size_t* outLen) const 
    if (size >= 0 && size < INT32_MAX) {

        *outLen = size;

        const char* str = (const char*)readInplace(size+1);

        if (str != nullptr) {

        if (str != nullptr && str[size] == '\0') {

            return str;

        }

    }
@@ -2141,7 +2141,7 @@ const char16_t* Parcel::readString16Inplace(size_t* outLen) const 
    if (size >= 0 && size < INT32_MAX) {

        *outLen = size;

        const char16_t* str = (const char16_t*)readInplace((size+1)*sizeof(char16_t));

        if (str != nullptr) {

        if (str != nullptr && str[size] == u'\0') {

            return str;

        }

    }