From c197c8a47eb9cf09b389f4dd5d235510feec18cb Mon Sep 17 00:00:00 2001 From: sugoi Date: Thu, 3 Jul 2014 10:44:26 -0700 Subject: Adding 64 bit checks Added a few more checks to avoid overflowing 32 bit sizes while computing convolutions. I also changed a dangerously misleading INHERITED typedef. BUG=389570 R=senorblanco@google.com, senorblanco@chromium.org Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/361403006 --- src/core/SkConvolver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/SkConvolver.cpp') diff --git a/src/core/SkConvolver.cpp b/src/core/SkConvolver.cpp index 4633c2e2ea..23a1ee3aaf 100644 --- a/src/core/SkConvolver.cpp +++ b/src/core/SkConvolver.cpp @@ -459,7 +459,7 @@ void BGRAConvolve2D(const unsigned char* sourceData, } // Compute where in the output image this row of final data will go. - unsigned char* curOutputRow = &output[outY * outputByteRowStride]; + unsigned char* curOutputRow = &output[(uint64_t)outY * outputByteRowStride]; // Get the list of rows that the circular buffer has, in order. int firstRowInCircularBuffer; -- cgit v1.2.3