wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1251742. Avoid overflow in computing area of surface sizes in SurfaceCache. r=dholbert

Browse Source 
http://hg.mozilla.org/mozilla-central/rev/9727cdebb2ee (bug 1228314) fixed the first instance of this, but missed the next two for some reason.
This commit is contained in:
Timothy Nikkel 2016-02-26 17:13:59 -06:00
parent 33ee000842
commit 4932973dce
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
image/SurfaceCache.cpp
View File

@ -227,6 +227,11 @@ private:
const SurfaceKey mSurfaceKey;
};
static int64_t
AreaOfIntSize(const IntSize& aSize) {
return static_cast<int64_t>(aSize.width) * static_cast<int64_t>(aSize.height);
}
/**
* An ImageSurfaceCache is a per-image surface cache. For correctness we must be
* able to remove all surfaces associated with an image when the image is
@ -327,11 +332,9 @@ public:
// Compare sizes. We use an area-based heuristic here instead of computing a
// truly optimal answer, since it seems very unlikely to make a difference
// for realistic sizes.
int64_t idealArea = static_cast<int64_t>(idealKey.Size().width) *
static_cast<int64_t>(idealKey.Size().height);
int64_t surfaceArea = aSurfaceKey.Size().width * aSurfaceKey.Size().height;
int64_t bestMatchArea =
bestMatchKey.Size().width * bestMatchKey.Size().height;
int64_t idealArea = AreaOfIntSize(idealKey.Size());
int64_t surfaceArea = AreaOfIntSize(aSurfaceKey.Size());
int64_t bestMatchArea = AreaOfIntSize(bestMatchKey.Size());
// If the best match is smaller than the ideal size, prefer bigger sizes.
if (bestMatchArea < idealArea) {

2
image/SurfaceCache.h
View File

@ -64,7 +64,7 @@ public:
return hash;
}
IntSize Size() const { return mSize; }
const IntSize& Size() const { return mSize; }
Maybe<SVGImageContext> SVGContext() const { return mSVGContext; }
float AnimationTime() const { return mAnimationTime; }
SurfaceFlags Flags() const { return mFlags; }