am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
* commit '604ae32bcc6791da813a8e594783b695131bf888':
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 6b99de8..ec4d8bf 100644
--- a/core/jni/android/graphics/Region.cpp
+++ b/core/jni/android/graphics/Region.cpp
@@ -218,7 +218,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 reinterpret_cast<jlong>(region);
}