summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-09-07 12:40:28 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-09-07 12:40:28 -0700
commit1c6eb19ad51cafda32df4d688cfbc329e0bce445 (patch)
tree78f144068559b3ab90d0d6a853722d6892a2f11b /libs
parent60f8bdfb455f0c1ff61c32427cc7de0389517257 (diff)
parent1ecb999624165ea2a9cf5e16b3f7e93358d503d6 (diff)
downloadframeworks_native-1c6eb19ad51cafda32df4d688cfbc329e0bce445.zip
frameworks_native-1c6eb19ad51cafda32df4d688cfbc329e0bce445.tar.gz
frameworks_native-1c6eb19ad51cafda32df4d688cfbc329e0bce445.tar.bz2
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:47 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
Diffstat (limited to 'libs')
-rw-r--r--libs/ui/Region.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index 3810da4..cfed7a9 100644
--- a/libs/ui/Region.cpp
+++ b/libs/ui/Region.cpp
@@ -795,6 +795,11 @@ status_t Region::unflatten(void const* buffer, size_t size) {
return NO_MEMORY;
}
+ if (numRects > (UINT32_MAX / sizeof(Rect))) {
+ android_errorWriteWithInfoLog(0x534e4554, "29983260", -1, NULL, 0);
+ return NO_MEMORY;
+ }
+
Region result;
result.mStorage.clear();
for (size_t r = 0; r < numRects; ++r) {