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

Commit 2bbcc253 authored by Leon Scroggins III's avatar Leon Scroggins III Committed by Android Git Automerger
Browse files

am b36ace74: Merge "Check that the parcel contained the expected amount of... 

am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

* commit 'b36ace74':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
parents 523a19bf b36ace74

core/jni/android/graphics/Region.cpp

+6 −2
Original line number Diff line number Diff line
@@ -212,9 +212,13 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel) 


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



    const size_t size = p->readInt32();

    const void* regionData = p->readInplace(size);

    if (regionData == NULL) {

        return NULL;

    }

    SkRegion* region = new SkRegion;

    size_t size = p->readInt32();

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

    region->readFromMemory(regionData, size);



    return reinterpret_cast<jlong>(region);

}