diff options
| author |  sugoi <sugoi@chromium.org> | 2014-07-03 10:44:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-03 10:44:26 -0700 |
| commit | c197c8a47eb9cf09b389f4dd5d235510feec18cb (patch) | |
| tree | 4fe97a698b9b9aab382d1615910e5df4808dd7af /src/core/SkConvolver.cpp | |
| parent | 2fe7b466c15fab6593da3bf32d3c3dbdf3917c01 (diff) | |
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
Diffstat (limited to 'src/core/SkConvolver.cpp')
| -rw-r--r-- | src/core/SkConvolver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |