fdo-mirrors/xorg-libxcursor
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libxcursor.git synced 2026-04-22 09:20:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct error handling in _XcursorAverageColor

Browse source 
Previously it would either div-zero or get stuck in a loop until int overflow
if called with a bad value.

cursor.c:214:32: warning: Division by zero
    return (0xff << 24) | ((red/npixels) << 16) | ((green/npixels) << 8) | (blue/npixels);

Found-by: clang static analyzer
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2011-05-07 10:16:18 -07:00
parent bee68e54e5
commit 047993c76a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/cursor.c
View file

@ -201,6 +201,9 @@ _XcursorAverageColor (XcursorPixel *pixels, int npixels)
XcursorPixel red, green, blue;
int n = npixels;
if (n < 1)
return 0;
blue = green = red = 0;
while (n--)
{
@ -209,8 +212,6 @@ _XcursorAverageColor (XcursorPixel *pixels, int npixels)
green += (p >> 8) & 0xff;
blue += (p >> 0) & 0xff;
}
if (!n)
return 0;
return (0xff << 24) | ((red/npixels) << 16) | ((green/npixels) << 8) | (blue/npixels);
}