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

Commit 5504686d authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android Git Automerger
Browse files

am 303d360e: am beda8613: Merge "Ensure that unparcelling Region only reads... 

am 303d360e: am beda8613: Merge "Ensure that unparcelling Region only reads the expected number of bytes" into mnc-dev

* commit '303d360e':
  Ensure that unparcelling Region only reads the expected number of bytes
parents e0f8db0a 303d360e

core/jni/android/graphics/Region.cpp

+8 −3
Original line number Diff line number Diff line
@@ -206,15 +206,20 @@ static jstring Region_toString(JNIEnv* env, jobject clazz, jlong regionHandle) { 


static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel)

{

    if (parcel == NULL) {

        return NULL;

    if (parcel == nullptr) {

        return 0;

    }



    android::Parcel* p = android::parcelForJavaObject(env, parcel);



    SkRegion* region = new SkRegion;

    size_t size = p->readInt32();

    region->readFromMemory(p->readInplace(size), size);

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



    if (size != actualSize) {

        delete region;

        return 0;

    }



    return reinterpret_cast<jlong>(region);

}