diff --git a/core/jni/android/graphics/Region.cpp b/core/jni/android/graphics/Region.cpp index 912968a9da3f9..536850317087c 100644 --- a/core/jni/android/graphics/Region.cpp +++ b/core/jni/android/graphics/Region.cpp @@ -212,9 +212,19 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel) android::Parcel* p = android::parcelForJavaObject(env, parcel); - SkRegion* region = new SkRegion; size_t size = p->readInt32(); - region->readFromMemory(p->readInplace(size), size); + const void* regionData = p->readInplace(size); + if (regionData == NULL) { + return NULL; + } + + SkRegion* region = new SkRegion; + size_t actualSize = region->readFromMemory(regionData, size); + + if (size != actualSize) { + delete region; + return NULL; + } return reinterpret_cast(region); }