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

Commit 7496e153 authored by Leon Scroggins III's avatar Leon Scroggins III Committed by Android Git Automerger
Browse files

am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 

* commit '0d208173':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
parents 11297581 0d208173

core/jni/android/graphics/Region.cpp

+6 −1
Original line number Diff line number Diff line
@@ -181,7 +181,12 @@ static SkRegion* Region_createFromParcel(JNIEnv* env, jobject clazz, jobject par 
        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 region;

}