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

Commit 4dae8e41 authored by Leon Scroggins III's avatar Leon Scroggins III Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected... 

Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
parents bf0652ee 6549eed8

core/jni/android/graphics/Region.cpp

+6 −1
Original line number Diff line number Diff line
@@ -218,7 +218,12 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel) 
        return NULL;

    }

    SkRegion* region = new SkRegion;

    region->readFromMemory(regionData, size);

    size_t actualSize = region->readFromMemory(regionData, size);



    if (size != actualSize) {

        delete region;

        return NULL;

    }



    return reinterpret_cast<jlong>(region);

}