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

Merge branch 'backport-2260-win32-registry-assert-glib-2-70' into 'glib-2-70'

Browse Source 
Backport !2260 “GWin32AppInfo: Remove assertion on the opened registry key” to glib-2-70

See merge request GNOME/glib!2313
This commit is contained in:
Philip Withnall
2021-11-01 15:34:54 +00:00
parent 2aca2cfbcc eb3bcf8ba0
commit eaf3169a4b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gwin32appinfo.c
View File

@@ -983,7 +983,10 @@ get_verbs (GWin32RegistryKey *program_id_key,
name,
NULL);
g_assert (subkey != NULL);
/* We may not have the required access rights to open the child key */
if (subkey == NULL)
continue;
/* The key we're looking at is "<some_root>/Shell/<this_key>",
* where "Shell" is verbshell_prefix.
* If it has a value named 'Subcommands' (doesn't matter what its data is),