From a7181ad39761d51ddac408c022e35eaf2d8f5827 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 28 Feb 2020 15:09:50 +0100 Subject: [PATCH] gcontenttype: Fix crash in _get_generic_icon_name() Guard against NULL type being passed to g_content_type_get_generic_icon_name() just as we protect g_content_type_get_description(), otherwise it will cause a crash. See https://gitlab.gnome.org/GNOME/gtk/issues/2482 --- gio/gcontenttype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c index 04d278db3..2716c8981 100644 --- a/gio/gcontenttype.c +++ b/gio/gcontenttype.c @@ -614,6 +614,8 @@ g_content_type_get_generic_icon_name (const gchar *type) const gchar *xdg_icon_name; gchar *icon_name; + g_return_val_if_fail (type != NULL, NULL); + G_LOCK (gio_xdgmime); xdg_icon_name = xdg_mime_get_generic_icon (type); G_UNLOCK (gio_xdgmime);