brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: Add missing %NULL check

Browse Source 
st_theme_node_get_border_image() may return %NULL, leading to a
segfault in st_border_image_get_file() when glib is compiled with
G_DISABLE_CHECKS.

https://bugzilla.gnome.org/show_bug.cgi?id=780381
This commit is contained in:
Florian Müllner 2017-03-22 01:26:08 +01:00
parent 5de85c708f
commit b477d215a8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/st/st-widget.c
View File

@ -290,6 +290,7 @@ st_widget_texture_cache_changed (StTextureCache *cache,
StWidget *actor = ST_WIDGET (user_data); StWidget *actor = ST_WIDGET (user_data);
StWidgetPrivate *priv = st_widget_get_instance_private (actor); StWidgetPrivate *priv = st_widget_get_instance_private (actor);
StThemeNode *node = priv->theme_node; StThemeNode *node = priv->theme_node;
StBorderImage *border_image;
gboolean changed = FALSE; gboolean changed = FALSE;
GFile *theme_file; GFile *theme_file;
@ -303,7 +304,8 @@ st_widget_texture_cache_changed (StTextureCache *cache,
changed = TRUE; changed = TRUE;
} }
theme_file = st_border_image_get_file (st_theme_node_get_border_image (node)); border_image = st_theme_node_get_border_image (node);
theme_file = border_image ? st_border_image_get_file (border_image) : NULL;
if ((theme_file != NULL) && g_file_equal (theme_file, file)) if ((theme_file != NULL) && g_file_equal (theme_file, file))
{ {
st_theme_node_invalidate_border_image (node); st_theme_node_invalidate_border_image (node);