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

Commit 18d79267 authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Check that the parcel contained the expected amount of region data. DO NOT MERGE

bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
parent 69b8e962
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -175,9 +175,13 @@ static SkRegion* Region_createFromParcel(JNIEnv* env, jobject clazz, jobject par

    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 region;
}