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

shell-mime-sniffer: Ignore invalid file content type

Browse Source 
The shell mime sniffer goes through all the files in a directory,
however in case a file content type is not recognized, the GIO function
g_file_info_get_content_type() may return NULL, causing a crash when
looking up into the content type tables, as they are supposed to contain
strings only and they use `g_str_hash` has func, which doesn't support
NULL values.

So, in case we get an invalid content type, let's just ignore it,
without adding it to the cache as we do in the nautilus code that was
inspiring the sniffer.

Fixes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2643


(cherry picked from commit 46547ae027)
This commit is contained in:
Marco Trevisan (Treviño) 2020-06-05 14:12:58 +00:00 committed by Marco Trevisan
parent b642f9275e
commit ff73f76527
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotplug-sniffer/shell-mime-sniffer.c
View File

@ -253,6 +253,8 @@ deep_count_one (DeepCountState *state,
else else
{ {
content_type = g_file_info_get_content_type (info); content_type = g_file_info_get_content_type (info);
if (content_type)
add_content_type_to_cache (state, content_type); add_content_type_to_cache (state, content_type);
} }
} }