commit b36ace7401c0e198ceddd2fdb908346b7bb5928f
author Leon Scroggins III <scroggo@google.com> Wed May 27 14:29:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 27 14:29:31 2015 +0000
tree cc0df38cebd69ebde738334cf0f6097f2d2374da
parent c9a0c0b90773fded6c251646300231f67c891b78
parent 5cfd16201fbcb4a095071058263682f7b4ab77a5

Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev

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);
 }