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

Fixed GtkCellRendererText invalid pointer access.

Browse Source 
Fixed get_desired_size() to not access parameters when NULL and
also not to access priv->object if it hasnt yet been assigned.
This commit is contained in:
Tristan Van Berkom 2010-04-03 19:48:14 -04:00
parent 0fbdb3c73f
commit 894e887370
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gtk/gtkcellrenderertext.c
View File

@ -1946,25 +1946,43 @@ gtk_cell_renderer_text_extended_layout_get_desired_size (GtkExtendedLayout *layo
priv = GTK_CELL_RENDERER_TEXT_GET_PRIVATE (layout);
if (minimal_size)
if (priv->owner)
{
get_size (GTK_CELL_RENDERER (layout),
priv->owner, NULL, NULL, NULL, NULL,
&minimal_size->width, &minimal_size->height);
if (minimal_size)
{
get_size (GTK_CELL_RENDERER (layout),
priv->owner, NULL, NULL, NULL, NULL,
&minimal_size->width, &minimal_size->height);
}
if (desired_size)
{
PangoEllipsizeMode ellipsize;
ellipsize = priv->ellipsize;
priv->ellipsize = PANGO_ELLIPSIZE_NONE;
get_size (GTK_CELL_RENDERER (layout),
priv->owner, NULL, NULL, NULL, NULL,
&desired_size->width, &desired_size->height);
priv->ellipsize = ellipsize;
}
}
if (desired_size)
else
{
PangoEllipsizeMode ellipsize;
if (minimal_size)
{
minimal_size->height = 0;
minimal_size->width = 0;
}
ellipsize = priv->ellipsize;
priv->ellipsize = PANGO_ELLIPSIZE_NONE;
get_size (GTK_CELL_RENDERER (layout),
priv->owner, NULL, NULL, NULL, NULL,
&desired_size->width, &desired_size->height);
priv->ellipsize = ellipsize;
if (desired_size)
{
desired_size->height = 0;
desired_size->width = 0;
}
}
}