Merge branch 'wip/hadess/avoid-all-remote-files-crash' into 'master'

gcontenttype: Fix crash in _get_generic_icon_name()

See merge request GNOME/glib!1398
This commit is contained in:
Sebastian Dröge 2020-02-28 14:49:51 +00:00
commit 2cad4fb5bf

View File

@ -614,6 +614,8 @@ g_content_type_get_generic_icon_name (const gchar *type)
const gchar *xdg_icon_name; const gchar *xdg_icon_name;
gchar *icon_name; gchar *icon_name;
g_return_val_if_fail (type != NULL, NULL);
G_LOCK (gio_xdgmime); G_LOCK (gio_xdgmime);
xdg_icon_name = xdg_mime_get_generic_icon (type); xdg_icon_name = xdg_mime_get_generic_icon (type);
G_UNLOCK (gio_xdgmime); G_UNLOCK (gio_xdgmime);