callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Be more careful with floating point divisions

Browse Source 
The assumption that MIN() takes care of all infinities here
turns out to be wrong. We were getting inf and -nan for some
combinations of 0 width/height and corners, leading to invalid
matrices and cairo errors.

https://bugzilla.gnome.org/show_bug.cgi?id=759668
This commit is contained in:
Matthias Clasen
2016-01-08 13:17:58 -05:00
parent 709cc08603
commit 3f56c530b3
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkroundedbox.c
View File

@ -56,16 +56,23 @@ static void
gtk_rounded_box_clamp_border_radius (GtkRoundedBox *box)
{
gdouble factor = 1.0;
gdouble corners;
/* note: division by zero leads to +INF, which is > factor, so will be ignored */
factor = MIN (factor, box->box.width / (box->corner[GTK_CSS_TOP_LEFT].horizontal +
box->corner[GTK_CSS_TOP_RIGHT].horizontal));
factor = MIN (factor, box->box.height / (box->corner[GTK_CSS_TOP_RIGHT].vertical +
box->corner[GTK_CSS_BOTTOM_RIGHT].vertical));
factor = MIN (factor, box->box.width / (box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal +
box->corner[GTK_CSS_BOTTOM_LEFT].horizontal));
factor = MIN (factor, box->box.height / (box->corner[GTK_CSS_TOP_LEFT].vertical +
box->corner[GTK_CSS_BOTTOM_LEFT].vertical));
corners = box->corner[GTK_CSS_TOP_LEFT].horizontal + box->corner[GTK_CSS_TOP_RIGHT].horizontal;
if (corners != 0)
factor = MIN (factor, box->box.width / corners);
corners = box->corner[GTK_CSS_TOP_RIGHT].vertical + box->corner[GTK_CSS_BOTTOM_RIGHT].vertical;
if (corners != 0)
factor = MIN (factor, box->box.height / corners);
corners = box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal + box->corner[GTK_CSS_BOTTOM_LEFT].horizontal;
if (corners != 0)
factor = MIN (factor, box->box.width / corners);
corners = box->corner[GTK_CSS_TOP_LEFT].vertical + box->corner[GTK_CSS_BOTTOM_LEFT].vertical;
if (corners != 0)
factor = MIN (factor, box->box.height / corners);
box->corner[GTK_CSS_TOP_LEFT].horizontal *= factor;
box->corner[GTK_CSS_TOP_LEFT].vertical *= factor;