Merge branch 'backport-3317-win32-null-checks-glib-2-74' into 'glib-2-74'

Backport !3317 “GWin32AppInfo: Add NULL string checks” to glib-2-74

See merge request GNOME/glib!3320
This commit is contained in:
Philip Withnall
2023-03-13 10:32:07 +00:00

View File

@@ -3100,6 +3100,9 @@ link_handlers_to_unregistered_apps (void)
if (handler_verb->app != NULL)
continue;
if (handler_verb->executable_folded == NULL)
continue;
handler_exe_basename = g_utf8_find_basename (handler_verb->executable_folded, -1);
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;
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);
/* First check that the executable paths are identical */