frameworks/native
リビジョン | 758c4603db85a58c4c5b4a328bbf4cffdf113056 (tree) |
---|---|
日時 | 2016-09-07 14:51:08 |
作者 | Chih-Wei Huang <cwhuang@linu...> |
コミッター | Chih-Wei Huang |
Merge tag 'android-6.0.1_r66' into marshmallow-x86
Android 6.0.1 release 66
@@ -795,6 +795,11 @@ status_t Region::unflatten(void const* buffer, size_t size) { | ||
795 | 795 | return NO_MEMORY; |
796 | 796 | } |
797 | 797 | |
798 | + if (numRects > (UINT32_MAX / sizeof(Rect))) { | |
799 | + android_errorWriteWithInfoLog(0x534e4554, "29983260", -1, NULL, 0); | |
800 | + return NO_MEMORY; | |
801 | + } | |
802 | + | |
798 | 803 | Region result; |
799 | 804 | result.mStorage.clear(); |
800 | 805 | for (size_t r = 0; r < numRects; ++r) { |