diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2023-03-13 10:32:07 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2023-03-13 10:32:07 +0000 |
| commit | a1e169129cfb0a7965c3b8d39d4a0f66ac658f86 (patch) | |
| tree | 2a3ae3bb493f5da161d07a374d86e6a4edbe8ced | |
| parent | 0559f4b8b6a73ccc3e0261febb6f7a4d91068ba6 (diff) | |
| parent | 6d1471815efabe21a11d7db30e751f98e71d9644 (diff) | |
| download | glib-a1e169129cfb0a7965c3b8d39d4a0f66ac658f86.tar.gz | |
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
| -rw-r--r-- | gio/gwin32appinfo.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c index 1bfcaf93d..543e18f5d 100644 --- a/gio/gwin32appinfo.c +++ b/gio/gwin32appinfo.c @@ -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 */ |