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

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

libbinder: readString*Inplace SafetyNet (II) am: 61d0f848 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2945a9d2f2acc742ce7817b309948cafdd0d377
parents abe42c95 61d0f848

libs/binder/Parcel.cpp

+10 −4
Original line number Diff line number Diff line
@@ -1869,9 +1869,12 @@ 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 && str[size] == '\0') {

        if (str != nullptr) {

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

                return str;

            }

            android_errorWriteLog(0x534e4554, "172655291");

        }

    }

    *outLen = 0;

    return nullptr;
@@ -1929,9 +1932,12 @@ 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 && str[size] == u'\0') {

        if (str != nullptr) {

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

                return str;

            }

            android_errorWriteLog(0x534e4554, "172655291");

        }

    }

    *outLen = 0;

    return nullptr;