aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Don't crash when the key isn't found.

Browse Source
This commit is contained in:
LemonBoy 2016-06-13 22:14:08 +02:00
parent 862729d7a3
commit 2da49e3ca6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/settings.c
View File

@ -153,7 +153,7 @@ int settings_get_choice(const char *key)
SETTINGS_REC *rec; SETTINGS_REC *rec;
CONFIG_NODE *node; CONFIG_NODE *node;
char *str; char *str;
int idx; int index;
rec = settings_get(key, SETTING_TYPE_CHOICE); rec = settings_get(key, SETTING_TYPE_CHOICE);
if (rec == NULL) return -1; if (rec == NULL) return -1;
@ -164,8 +164,10 @@ int settings_get_choice(const char *key)
str = node == NULL ? rec->default_value.v_string : str = node == NULL ? rec->default_value.v_string :
config_node_get_str(node, key, rec->default_value.v_string); config_node_get_str(node, key, rec->default_value.v_string);
idx = strarray_find(rec->choices, str); if (str == NULL || (index = strarray_find(rec->choices, str)) < 0)
return (idx < 0) ? rec->default_value.v_int : idx; return rec->default_value.v_int;
return index;
} }
char *settings_get_print(SETTINGS_REC *rec) char *settings_get_print(SETTINGS_REC *rec)