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

keyring-prompt: relax NULL check in remove_mnemonics()

Browse Source 
Instead of considering a GValue containing a NULL string to be a
programmer error, simply return NULL.
remove_mnemonics() is in fact called on the value of the
"choice-label" property as well, which has NULL as its default
value.

This prevents triggering the following gnome-shell warning:

gnome-shell[1082]: remove_mnemonics: assertion 'label != NULL' failed

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/555
This commit is contained in:
Cosimo Cecchi 2019-05-26 10:16:03 -07:00
parent 96c2473317
commit 2c45b5416e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shell-keyring-prompt.c
View File

@ -115,7 +115,8 @@ remove_mnemonics (const GValue *value)
g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL); g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);
label = g_value_get_string (value); label = g_value_get_string (value);
g_return_val_if_fail (label != NULL, NULL); if (!label)
return NULL;
/* Stripped label will have the original label length at most */ /* Stripped label will have the original label length at most */
stripped_label = temp = g_new (gchar, strlen(label) + 1); stripped_label = temp = g_new (gchar, strlen(label) + 1);