blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add some extra tests on arguments for config functions

Browse Source
This commit is contained in:
Sebastien Helleu 2009-02-05 18:09:58 +01:00
parent d7bec49b71
commit 52f68cc615
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/wee-config-file.c
View File

@ -233,12 +233,15 @@ config_file_option_find_pos (struct t_config_section *section, const char *name)
{ {
struct t_config_option *ptr_option; struct t_config_option *ptr_option;
if (section && name)
{
for (ptr_option = section->options; ptr_option; for (ptr_option = section->options; ptr_option;
ptr_option = ptr_option->next_option) ptr_option = ptr_option->next_option)
{ {
if (string_strcasecmp (name, ptr_option->name) < 0) if (string_strcasecmp (name, ptr_option->name) < 0)
return ptr_option; return ptr_option;
} }
}
/* position not found (we will add to the end of list) */ /* position not found (we will add to the end of list) */
return NULL; return NULL;
@ -254,7 +257,7 @@ config_file_option_insert_in_section (struct t_config_option *option)
{ {
struct t_config_option *pos_option; struct t_config_option *pos_option;
if (!option->section) if (!option || !option->section)
return; return;
if (option->section->options) if (option->section->options)
@ -522,6 +525,9 @@ config_file_option_full_name (struct t_config_option *option)
int length_option; int length_option;
char *option_full_name; char *option_full_name;
if (!option)
return NULL;
length_option = strlen (option->config_file->name) + 1 + length_option = strlen (option->config_file->name) + 1 +
strlen (option->section->name) + 1 + strlen (option->name) + 1; strlen (option->section->name) + 1 + strlen (option->name) + 1;
option_full_name = malloc (length_option); option_full_name = malloc (length_option);
@ -1187,6 +1193,9 @@ config_file_option_set_null (struct t_config_option *option, int run_callback)
int rc; int rc;
char *option_full_name; char *option_full_name;
if (!option)
return WEECHAT_CONFIG_OPTION_SET_ERROR;
rc = WEECHAT_CONFIG_OPTION_SET_ERROR; rc = WEECHAT_CONFIG_OPTION_SET_ERROR;
/* null value is authorized only if it's allowed in option */ /* null value is authorized only if it's allowed in option */
@ -1243,6 +1252,9 @@ config_file_option_unset (struct t_config_option *option)
int rc; int rc;
char *option_full_name; char *option_full_name;
if (!option)
return WEECHAT_CONFIG_OPTION_UNSET_ERROR;
rc = WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET; rc = WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET;
if (option->section && option->section->user_can_delete_options) if (option->section && option->section->user_can_delete_options)
@ -1305,7 +1317,7 @@ void
config_file_option_rename (struct t_config_option *option, config_file_option_rename (struct t_config_option *option,
const char *new_name) const char *new_name)
{ {
if (!new_name || !new_name[0] if (!option || !new_name || !new_name[0]
|| config_file_search_option (option->config_file, option->section, new_name)) || config_file_search_option (option->config_file, option->section, new_name))
return; return;
@ -1340,6 +1352,9 @@ void *
config_file_option_get_pointer (struct t_config_option *option, config_file_option_get_pointer (struct t_config_option *option,
const char *property) const char *property)
{ {
if (!option || !property)
return NULL;
if (string_strcasecmp (property, "config_file") == 0) if (string_strcasecmp (property, "config_file") == 0)
return option->config_file; return option->config_file;
else if (string_strcasecmp (property, "section") == 0) else if (string_strcasecmp (property, "section") == 0)