Adding 64 bit checks

src/core/SkConvolver.cpp

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "SkConvolver.h"
 #include "SkSize.h"
 #include "SkTypes.h"
 
 namespace {
 
@@ skipping 441 matching lines @@
                         ConvolveHorizontallyNoAlpha(
                             &sourceData[(uint64_t)nextXRow * sourceByteRowStride],
                             filterX, rowBuffer.advanceRow());
                     }
                 }
                 nextXRow++;
             }
         }
 
         // 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];

[reed1, 2014/07/07 13:16:40]

future note: sk_64_mul() was written to for this sort of thing.

 
         // Get the list of rows that the circular buffer has, in order.
         int firstRowInCircularBuffer;
         unsigned char* const* rowsToConvolve =
             rowBuffer.GetRowAddresses(&firstRowInCircularBuffer);
 
         // Now compute the start of the subset of those rows that the filter
         // needs.
         unsigned char* const* firstRowForFilter =
             &rowsToConvolve[filterOffset - firstRowInCircularBuffer];
 
         if (convolveProcs.fConvolveVertically) {
             convolveProcs.fConvolveVertically(filterValues, filterLength,
                                                firstRowForFilter,
                                                filterX.numValues(), curOutputRow,
                                                sourceHasAlpha);
         } else {
             ConvolveVertically(filterValues, filterLength,
                                firstRowForFilter,
                                filterX.numValues(), curOutputRow,
                                sourceHasAlpha);
         }
     }
 }