Commit 3ff978a5 authored Jun 10, 2015 by Leon Scroggins III Committed by Android Git Automerger Jun 10, 2015

am 77dde3cb: am 6b16398d: am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE:...

am 77dde3cb: am 6b16398d: am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev

* commit '77dde3cb':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes

parents 34c7bd7c 77dde3cb

core/jni/android/graphics/Region.cpp

+6 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,12 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel)
		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 reinterpret_cast<jlong>(region);
		}