Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 381074 - Add overflow check for unit conversion in NSFloatPixelsToAppUnits.

Browse Source 
r=bz sr=roc blocking1.9=dbaron


git-svn-id: svn://10.0.0.236/trunk@236665 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dholbert%cs.stanford.edu 2007-09-25 17:12:17 +00:00
parent d7f23f12d3
commit 54f4fd0dae
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/xpcom/ds/nsUnitConversion.h
View File

@ -88,9 +88,27 @@ inline PRInt32 NSToIntRound(float aValue)
*/
inline nscoord NSFloatPixelsToAppUnits(float aPixels, PRInt32 aAppUnitsPerPixel)
{
nscoord r = NSToCoordRound(aPixels * aAppUnitsPerPixel);
VERIFY_COORD(r);
return r;
float product = aPixels * aAppUnitsPerPixel;
nscoord result;
#ifdef NS_COORD_IS_FLOAT
// No need to bounds-check if converting float to float
result = NSToCoordRound(product);
#else
// Bounds-check before converting out of float, to avoid overflow
if (product >= nscoord_MAX) {
NS_WARNING("Overflowed nscoord_MAX in conversion to nscoord");
result = nscoord_MAX;
} else if (product <= nscoord_MIN) {
NS_WARNING("Overflowed nscoord_MIN in conversion to nscoord");
result = nscoord_MIN;
} else {
result = NSToCoordRound(product);
}
#endif
VERIFY_COORD(result);
return result;
}
inline nscoord NSIntPixelsToAppUnits(PRInt32 aPixels, PRInt32 aAppUnitsPerPixel)