am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '0d2081734ce124191ac1f3e8585336daa414abbe':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
diff --git a/core/jni/android/graphics/Region.cpp b/core/jni/android/graphics/Region.cpp
index 1e0cf96..d901e9c 100644
--- a/core/jni/android/graphics/Region.cpp
+++ b/core/jni/android/graphics/Region.cpp
@@ -181,7 +181,12 @@
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 region;
}