Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 920571 - Don't read from the trailing stride on the last row of pixels when copying image data in SourceSurfaceCG. r=jrmuizel

Browse Source
This commit is contained in:
Matt Woodrow 2013-09-30 14:42:45 +13:00
parent 42dfe0a70f
commit 67946c1e49
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/2d/SourceSurfaceCG.cpp
View File

@ -127,7 +127,9 @@ SourceSurfaceCG::InitFromData(unsigned char *aData,
assert(aSize.width >= 0 && aSize.height >= 0);
void *data = malloc(aStride * aSize.height);
memcpy(data, aData, aStride * aSize.height);
// Copy all the data except the stride padding on the very last
// row since we can't guarantee that is readable.
memcpy(data, aData, aStride * (aSize.height - 1) + aSize.width);
mFormat = aFormat;
mImage = CreateCGImage(data, data, aSize, aStride, aFormat);
@ -162,7 +164,7 @@ DataSourceSurfaceCG::InitFromData(unsigned char *aData,
}
void *data = malloc(aStride * aSize.height);
memcpy(data, aData, aStride * aSize.height);
memcpy(data, aData, aStride * (aSize.height - 1) + aSize.width);
mFormat = aFormat;
mImage = CreateCGImage(data, data, aSize, aStride, aFormat);