AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Always set out value

Browse Source 
Don't leave memory in an unitinialized case when returning FALSE from
gtk_widget_compute_transform().

We both know that people are going to call that function without
checking the return value.
This commit is contained in:
Benjamin Otte 2019-02-20 04:07:34 +01:00
parent 8fbfa955de
commit 514c3679dc
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkwidget.c
View File

@ -11245,7 +11245,8 @@ gtk_widget_pick (GtkWidget *widget,
*
* Returns: %TRUE if the transform could be computed, %FALSE otherwise.
* The transform can not be computed in certain cases, for example when
* @widget and @target do not share a common ancestor.
* @widget and @target do not share a common ancestor. In that
* case @out_transform gets set to the identity matrix.
*/
gboolean
gtk_widget_compute_transform (GtkWidget *widget,
@ -11268,7 +11269,10 @@ gtk_widget_compute_transform (GtkWidget *widget,
ancestor = gtk_widget_common_ancestor (widget, target);
if (ancestor == NULL)
return FALSE;
{
graphene_matrix_init_identity (out_transform);
return FALSE;
}
graphene_matrix_init_identity (&transform);
for (iter = widget; iter != ancestor; iter = iter->priv->parent)
@ -11293,7 +11297,10 @@ gtk_widget_compute_transform (GtkWidget *widget,
graphene_matrix_multiply (&inverse, &priv->transform, &inverse);
}
if (!graphene_matrix_inverse (&inverse, &inverse))
return FALSE;
{
graphene_matrix_init_identity (out_transform);
return FALSE;
}
graphene_matrix_multiply (&transform, &inverse, out_transform);