gaoyang3513/SDK_RK3288
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[external/skia] SkScaledBitmapSampler: fix memory overwritten

Browse Source 
Cherry-picked from https://codereview.chromium.org/1085253002
in Skia.

Memory will be overwritten while downsampling some
interlaced gif images, most commonly with odd sizes,
when index of destination row stores in the current
line computed from GifInterlaceIter meets:

 X is an integer in [0..height-1]
   and
 (X < height)
 && ((X - sampleSize/2) % sampleSize == 0)
 && ((X - sampleSize/2)/sampleSize >= height/sampleSize)

Signed-off-by: Firefly <service@t-firefly.com>

BUG=skia:

Review URL: https://codereview.chromium.org/1085253002

BUG:20723696
Change-Id: I2cca83a2a5c39b5a497f36b40724262b438ead8b
This commit is contained in:
Firefly
2015-04-16 11:03:16 -07:00
committed by djw
parent a4243ab6ed
commit 04681dc762
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
external/skia/src/images/SkScaledBitmapSampler.cpp vendored
View File

@ -763,7 +763,9 @@ bool SkScaledBitmapSampler::sampleInterlaced(const uint8_t* SK_RESTRICT src, int
// of the destination bitmap's pixels, which is used to calculate the destination row
// each time this function is called.
const int dstY = srcYMinusY0 / fDY;
SkASSERT(dstY < fScaledHeight);
if (dstY >= fScaledHeight) {
return false;
}
char* dstRow = fDstRow + dstY * fDstRowBytes;
return fRowProc(dstRow, src + fX0 * fSrcPixelSize, fScaledWidth,
fDX * fSrcPixelSize, dstY, fCTable);