Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 619048 - Correctly reject zero-height and zero-width images. r=jrmuizel

Browse Source
This commit is contained in:
Joe Drew 2011-07-01 13:03:47 -04:00
parent e45da523d9
commit 6953ba8be8
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/libpr0n/src/imgFrame.cpp
View File

@ -69,9 +69,6 @@ static PRUint32 gTotalDDBSize = 0;
// Returns true if an image of aWidth x aHeight is allowed and legal.
static PRBool AllowedImageSize(PRInt32 aWidth, PRInt32 aHeight)
{
NS_ASSERTION(aWidth > 0, "invalid image width");
NS_ASSERTION(aHeight > 0, "invalid image height");
// reject over-wide or over-tall images
const PRInt32 k64KLimit = 0x0000FFFF;
if (NS_UNLIKELY(aWidth > k64KLimit || aHeight > k64KLimit )) {
@ -79,9 +76,8 @@ static PRBool AllowedImageSize(PRInt32 aWidth, PRInt32 aHeight)
return PR_FALSE;
}
// protect against division by zero - this really shouldn't happen
// if our consumers were well behaved, but they aren't (bug 368427)
if (NS_UNLIKELY(aHeight == 0)) {
// protect against invalid sizes
if (NS_UNLIKELY(aHeight <= 0 || aWidth <= 0)) {
return PR_FALSE;
}