luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-issue-2922' into 'main'

Browse Source 
GWin32AppInfo: Add NULL string checks

Closes #2922

See merge request GNOME/glib!3317
This commit is contained in:
Philip Withnall 2023-03-10 16:05:03 +00:00
commit 618c340726
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gwin32appinfo.c
View File

@ -3100,6 +3100,9 @@ link_handlers_to_unregistered_apps (void)
if (handler_verb->app != NULL) if (handler_verb->app != NULL)
continue; continue;
if (handler_verb->executable_folded == NULL)
continue;
handler_exe_basename = g_utf8_find_basename (handler_verb->executable_folded, -1); handler_exe_basename = g_utf8_find_basename (handler_verb->executable_folded, -1);
g_hash_table_iter_init (&app_iter, apps_by_id); g_hash_table_iter_init (&app_iter, apps_by_id);
@ -3119,6 +3122,9 @@ link_handlers_to_unregistered_apps (void)
const gchar *app_exe_basename; const gchar *app_exe_basename;
app_verb = _verb_idx (app->verbs, ai); app_verb = _verb_idx (app->verbs, ai);
if (app_verb->executable_folded == NULL)
continue;
app_exe_basename = g_utf8_find_basename (app_verb->executable_folded, -1); app_exe_basename = g_utf8_find_basename (app_verb->executable_folded, -1);
/* First check that the executable paths are identical */ /* First check that the executable paths are identical */