am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '18d7926709451b9e767731f46778e4238fc8e3b5':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
diff --git a/core/jni/android/graphics/Region.cpp b/core/jni/android/graphics/Region.cpp
index f0a7baf..1e0cf96 100644
--- a/core/jni/android/graphics/Region.cpp
+++ b/core/jni/android/graphics/Region.cpp
@@ -175,9 +175,13 @@
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;
}