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

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

Merge "Check that the parcel contained the expected amount of region data. DO...

Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
parents c9a0c0b9 5cfd1620
Loading
Loading
Loading
Loading
+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);
}