pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 05:46:38 +02:00
Code Activity

api: fix crash when reading config options with NULL value (closes #238)

Browse Source
This commit is contained in:
Sébastien Helleu
2014-10-23 21:53:35 +02:00
parent 2498ff63db
commit 65d15042d3
2 changed files with 91 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.asciidoc
+1
View File
@@ -38,6 +38,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* core: display time in bare display only if option
weechat.look.buffer_time_format is not an empty string
* core: fix translation of message displayed after /upgrade
* api: fix crash when reading config options with NULL value (closes #238)
* irc: add tag "nick_xxx" in invite messages
* irc: fix completion of commands /msg, /notice and /query
* irc: fix translation of CTCP PING reply (closes #137)
src/core/wee-config-file.c
+90 -88
View File
@@ -1852,13 +1852,12 @@ config_file_option_set_with_string (const char *option_name, const char *value)
int
config_file_option_boolean (struct t_config_option *option)
{
if (!option)
return 0;
if (option->type == CONFIG_OPTION_TYPE_BOOLEAN)
if (option && option->value
&& (option->type == CONFIG_OPTION_TYPE_BOOLEAN))
{
return CONFIG_BOOLEAN(option);
else
return 0;
}
return 0;
}
/*
@@ -1870,13 +1869,12 @@ config_file_option_boolean (struct t_config_option *option)
int
config_file_option_boolean_default (struct t_config_option *option)
{
if (!option)
return 0;
if (option->type == CONFIG_OPTION_TYPE_BOOLEAN)
if (option && option->default_value
&& (option->type == CONFIG_OPTION_TYPE_BOOLEAN))
{
return CONFIG_BOOLEAN_DEFAULT(option);
else
return 0;
}
return 0;
}
/*
@@ -1886,23 +1884,23 @@ config_file_option_boolean_default (struct t_config_option *option)
int
config_file_option_integer (struct t_config_option *option)
{
if (!option)
return 0;
switch (option->type)
if (option && option->value)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
if (CONFIG_BOOLEAN(option) == CONFIG_BOOLEAN_TRUE)
return 1;
else
switch (option->type)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
if (CONFIG_BOOLEAN(option) == CONFIG_BOOLEAN_TRUE)
return 1;
else
return 0;
case CONFIG_OPTION_TYPE_INTEGER:
case CONFIG_OPTION_TYPE_COLOR:
return CONFIG_INTEGER(option);
case CONFIG_OPTION_TYPE_STRING:
return 0;
case CONFIG_OPTION_TYPE_INTEGER:
case CONFIG_OPTION_TYPE_COLOR:
return CONFIG_INTEGER(option);
case CONFIG_OPTION_TYPE_STRING:
return 0;
case CONFIG_NUM_OPTION_TYPES:
break;
case CONFIG_NUM_OPTION_TYPES:
break;
}
}
return 0;
}
@@ -1914,23 +1912,23 @@ config_file_option_integer (struct t_config_option *option)
int
config_file_option_integer_default (struct t_config_option *option)
{
if (!option)
return 0;
switch (option->type)
if (option && option->default_value)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
if (CONFIG_BOOLEAN_DEFAULT(option) == CONFIG_BOOLEAN_TRUE)
return 1;
else
switch (option->type)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
if (CONFIG_BOOLEAN_DEFAULT(option) == CONFIG_BOOLEAN_TRUE)
return 1;
else
return 0;
case CONFIG_OPTION_TYPE_INTEGER:
case CONFIG_OPTION_TYPE_COLOR:
return CONFIG_INTEGER_DEFAULT(option);
case CONFIG_OPTION_TYPE_STRING:
return 0;
case CONFIG_OPTION_TYPE_INTEGER:
case CONFIG_OPTION_TYPE_COLOR:
return CONFIG_INTEGER_DEFAULT(option);
case CONFIG_OPTION_TYPE_STRING:
return 0;
case CONFIG_NUM_OPTION_TYPES:
break;
case CONFIG_NUM_OPTION_TYPES:
break;
}
}
return 0;
}
@@ -1942,26 +1940,26 @@ config_file_option_integer_default (struct t_config_option *option)
const char *
config_file_option_string (struct t_config_option *option)
{
if (!option)
return NULL;
switch (option->type)
if (option && option->value)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
if (CONFIG_BOOLEAN(option))
return config_boolean_true[0];
else
return config_boolean_false[0];
case CONFIG_OPTION_TYPE_INTEGER:
if (option->string_values)
return option->string_values[CONFIG_INTEGER(option)];
return NULL;
case CONFIG_OPTION_TYPE_STRING:
return CONFIG_STRING(option);
case CONFIG_OPTION_TYPE_COLOR:
return gui_color_get_name (CONFIG_COLOR(option));
case CONFIG_NUM_OPTION_TYPES:
return NULL;
switch (option->type)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
if (CONFIG_BOOLEAN(option))
return config_boolean_true[0];
else
return config_boolean_false[0];
case CONFIG_OPTION_TYPE_INTEGER:
if (option->string_values)
return option->string_values[CONFIG_INTEGER(option)];
return NULL;
case CONFIG_OPTION_TYPE_STRING:
return CONFIG_STRING(option);
case CONFIG_OPTION_TYPE_COLOR:
return gui_color_get_name (CONFIG_COLOR(option));
case CONFIG_NUM_OPTION_TYPES:
return NULL;
}
}
return NULL;
}
@@ -1973,26 +1971,26 @@ config_file_option_string (struct t_config_option *option)
const char *
config_file_option_string_default (struct t_config_option *option)
{
if (!option)
return NULL;
switch (option->type)
if (option && option->default_value)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
if (CONFIG_BOOLEAN_DEFAULT(option))
return config_boolean_true[0];
else
return config_boolean_false[0];
case CONFIG_OPTION_TYPE_INTEGER:
if (option->string_values)
return option->string_values[CONFIG_INTEGER_DEFAULT(option)];
return NULL;
case CONFIG_OPTION_TYPE_STRING:
return CONFIG_STRING_DEFAULT(option);
case CONFIG_OPTION_TYPE_COLOR:
return gui_color_get_name (CONFIG_COLOR_DEFAULT(option));
case CONFIG_NUM_OPTION_TYPES:
return NULL;
switch (option->type)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
if (CONFIG_BOOLEAN_DEFAULT(option))
return config_boolean_true[0];
else
return config_boolean_false[0];
case CONFIG_OPTION_TYPE_INTEGER:
if (option->string_values)
return option->string_values[CONFIG_INTEGER_DEFAULT(option)];
return NULL;
case CONFIG_OPTION_TYPE_STRING:
return CONFIG_STRING_DEFAULT(option);
case CONFIG_OPTION_TYPE_COLOR:
return gui_color_get_name (CONFIG_COLOR_DEFAULT(option));
case CONFIG_NUM_OPTION_TYPES:
return NULL;
}
}
return NULL;
}
@@ -2004,10 +2002,12 @@ config_file_option_string_default (struct t_config_option *option)
const char *
config_file_option_color (struct t_config_option *option)
{
if (!option)
return NULL;
return gui_color_get_name (CONFIG_COLOR(option));
if (option && option->value
&& (option->type == CONFIG_OPTION_TYPE_COLOR))
{
return gui_color_get_name (CONFIG_COLOR(option));
}
return NULL;
}
/*
@@ -2017,10 +2017,12 @@ config_file_option_color (struct t_config_option *option)
const char *
config_file_option_color_default (struct t_config_option *option)
{
if (!option)
return NULL;
return gui_color_get_name (CONFIG_COLOR_DEFAULT(option));
if (option && option->default_value
&& (option->type == CONFIG_OPTION_TYPE_COLOR))
{
return gui_color_get_name (CONFIG_COLOR_DEFAULT(option));
}
return NULL;
}
/*