luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 10:38:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-1085-xdgmime-glib-2-62' into 'glib-2-62'

Browse Source 
Backport !1085 “xdgmime: Prevent infinite loops from badly-formed MIME registrations” to glib-2-62

See merge request GNOME/glib!1103
This commit is contained in:
Sebastian Dröge 2019-09-13 13:58:26 +00:00
commit e2e51082be
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/xdgmime/xdgmimecache.c
View File

@ -965,7 +965,9 @@ _xdg_mime_cache_mime_type_subclass (const char *mime,
for (j = 0; j < n_parents; j++) for (j = 0; j < n_parents; j++)
{ {
parent_offset = GET_UINT32 (cache->buffer, offset + 4 + 4 * j); parent_offset = GET_UINT32 (cache->buffer, offset + 4 + 4 * j);
if (_xdg_mime_cache_mime_type_subclass (cache->buffer + parent_offset, ubase)) if (strcmp (cache->buffer + parent_offset, mime) != 0 &&
strcmp (cache->buffer + parent_offset, umime) != 0 &&
_xdg_mime_cache_mime_type_subclass (cache->buffer + parent_offset, ubase))
return 1; return 1;
} }