commit 4cff1f49ff95d990d6c2614da5d5a23d02145885
author Leon Scroggins III <scroggo@google.com> Tue May 26 16:41:09 2015 -0400
committer The Android Automerger <android-build@google.com> Thu Aug 13 19:41:41 2015 -0700
tree 9c4df3c5515684efbd2145bd9add4e738ef1f958
parent a5e904e7eb3aaec532de83ca52e24af18e0496b4

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

bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b

core/jni/android/graphics/Region.cpp

diff --git a/core/jni/android/graphics/Region.cpp b/core/jni/android/graphics/Region.cpp
index 912968a..6b99de8 100644
--- a/core/jni/android/graphics/Region.cpp
+++ b/core/jni/android/graphics/Region.cpp
@@ -212,9 +212,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 reinterpret_cast<jlong>(region);
 }