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

border-image: don't try to unpack values from a NULL border-image

Browse Source 
NULL is a valid value for border-image, so if it's NULL when unpacking,
don't try to access the struct fields, but just init the GValues for the
unpacked parameters.
This commit is contained in:
Cosimo Cecchi
2011-06-09 14:54:00 -04:00
parent fe7125e00c
commit 42d7487a6e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkborderimage.c
View File

@ -139,15 +139,19 @@ _gtk_border_image_unpack (const GValue *value,
parameter[0].name = "border-image-source"; parameter[0].name = "border-image-source";
g_value_init (&parameter[0].value, CAIRO_GOBJECT_TYPE_PATTERN); g_value_init (&parameter[0].value, CAIRO_GOBJECT_TYPE_PATTERN);
g_value_set_boxed (&parameter[0].value, image->source);
parameter[1].name = "border-image-slice"; parameter[1].name = "border-image-slice";
g_value_init (&parameter[1].value, GTK_TYPE_BORDER); g_value_init (&parameter[1].value, GTK_TYPE_BORDER);
g_value_set_boxed (&parameter[1].value, &image->slice);
parameter[2].name = "border-image-repeat"; parameter[2].name = "border-image-repeat";
g_value_init (&parameter[2].value, GTK_TYPE_CSS_BORDER_IMAGE_REPEAT); g_value_init (&parameter[2].value, GTK_TYPE_CSS_BORDER_IMAGE_REPEAT);
if (image != NULL)
{
g_value_set_boxed (&parameter[0].value, image->source);
g_value_set_boxed (&parameter[1].value, &image->slice);
g_value_set_boxed (&parameter[2].value, &image->repeat); g_value_set_boxed (&parameter[2].value, &image->repeat);
}
*n_params = 3; *n_params = 3;
return parameter; return parameter;