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

Test return code of some malloc/strdup

v2.8-utf8proc
Sebastien Helleu 2009-02-23 13:45:30 +01:00
parent 70cfce2d2c
commit 426ab803cb
5 changed files with 428 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,9 @@ char *config_boolean_true[] = { "on", "yes", "y", "true", "t", "1", NULL };
char *config_boolean_false[] = { "off", "no", "n", "false", "f", "0", NULL };
void config_file_option_free_data (struct t_config_option *option);
/*
* config_file_search: search a configuration file
*/
@ -99,6 +102,11 @@ config_file_new (struct t_weechat_plugin *plugin, const char *name,
{
new_config_file->plugin = plugin;
new_config_file->name = strdup (name);
if (!new_config_file->name)
{
free (new_config_file);
return NULL;
}
length = strlen (name) + 8 + 1;
filename = malloc (length);
if (filename)
@ -109,6 +117,12 @@ config_file_new (struct t_weechat_plugin *plugin, const char *name,
}
else
new_config_file->filename = strdup (name);
if (!new_config_file->filename)
{
free (new_config_file->name);
free (new_config_file);
return NULL;
}
new_config_file->file = NULL;
new_config_file->callback_reload = callback_reload;
new_config_file->callback_reload_data = callback_reload_data;
@ -173,6 +187,11 @@ config_file_new_section (struct t_config_file *config_file, const char *name,
{
new_section->config_file = config_file;
new_section->name = strdup (name);
if (!new_section->name)
{
free (new_section);
return NULL;
}
new_section->user_can_add_options = user_can_add_options;
new_section->user_can_delete_options = user_can_delete_options;
new_section->callback_read = callback_read;
@ -295,6 +314,43 @@ config_file_option_insert_in_section (struct t_config_option *option)
}
}
/*
* config_file_option_malloc: allocate memory for new option and fill it with 0/NULL
*/
struct t_config_option *
config_file_option_malloc ()
{
struct t_config_option *new_option;
new_option = malloc (sizeof (*new_option));
if (new_option)
{
new_option->config_file = NULL;
new_option->section = NULL;
new_option->name = NULL;
new_option->type = 0;
new_option->description = NULL;
new_option->string_values = NULL;
new_option->min = 0;
new_option->max = 0;
new_option->default_value = NULL;
new_option->value = NULL;
new_option->null_value_allowed = 0;
new_option->callback_check_value = NULL;
new_option->callback_check_value_data = NULL;
new_option->callback_change = NULL;
new_option->callback_change_data = NULL;
new_option->callback_delete = NULL;
new_option->callback_delete_data = NULL;
new_option->loaded = 0;
new_option->prev_option = NULL;
new_option->next_option = NULL;
}
return new_option;
}
/*
* config_file_new_option: create a new option
*/
@ -357,39 +413,53 @@ config_file_new_option (struct t_config_file *config_file,
return NULL;
}
new_option = malloc (sizeof (*new_option));
new_option = config_file_option_malloc ();
if (new_option)
{
new_option->config_file = config_file;
new_option->section = section;
new_option->name = strdup (name);
if (!new_option->name)
goto error;
new_option->type = var_type;
new_option->description = (description) ? strdup (description) : NULL;
new_option->default_value = NULL;
new_option->value = NULL;
if (description)
{
new_option->description = strdup (description);
if (!new_option->description)
goto error;
}
argc = 0;
switch (var_type)
{
case CONFIG_OPTION_TYPE_BOOLEAN:
new_option->string_values = NULL;
new_option->min = CONFIG_BOOLEAN_FALSE;
new_option->max = CONFIG_BOOLEAN_TRUE;
if (default_value)
{
int_value = config_file_string_to_boolean (default_value);
new_option->default_value = malloc (sizeof (int));
if (!new_option->default_value)
goto error;
*((int *)new_option->default_value) = int_value;
}
if (value)
{
int_value = config_file_string_to_boolean (value);
new_option->value = malloc (sizeof (int));
if (!new_option->value)
goto error;
*((int *)new_option->value) = int_value;
}
break;
case CONFIG_OPTION_TYPE_INTEGER:
new_option->string_values = (string_values) ?
string_explode (string_values, "|", 0, 0, &argc) : NULL;
if (string_values)
{
new_option->string_values = string_explode (string_values,
"|", 0, 0,
&argc);
if (!new_option->string_values)
goto error;
}
if (new_option->string_values)
{
new_option->min = 0;
@ -407,6 +477,8 @@ config_file_new_option (struct t_config_file *config_file,
}
}
new_option->default_value = malloc (sizeof (int));
if (!new_option->default_value)
goto error;
*((int *)new_option->default_value) = index_value;
}
if (value)
@ -422,12 +494,13 @@ config_file_new_option (struct t_config_file *config_file,
}
}
new_option->value = malloc (sizeof (int));
if (!new_option->value)
goto error;
*((int *)new_option->value) = index_value;
}
}
else
{
new_option->string_values = NULL;
new_option->min = min;
new_option->max = max;
if (default_value)
@ -441,6 +514,8 @@ config_file_new_option (struct t_config_file *config_file,
else if (number > max)
number = max;
new_option->default_value = malloc (sizeof (int));
if (!new_option->default_value)
goto error;
*((int *)new_option->default_value) = number;
}
if (value)
@ -454,38 +529,44 @@ config_file_new_option (struct t_config_file *config_file,
else if (number > max)
number = max;
new_option->value = malloc (sizeof (int));
if (!new_option->value)
goto error;
*((int *)new_option->value) = number;
}
}
break;
case CONFIG_OPTION_TYPE_STRING:
new_option->string_values = NULL;
new_option->min = min;
new_option->max = max;
if (default_value)
{
new_option->default_value = (default_value) ?
strdup (default_value) : NULL;
new_option->default_value = strdup (default_value);
if (!new_option->default_value)
goto error;
}
if (value)
{
new_option->value = (value) ?
strdup (value) : NULL;
new_option->value = strdup (value);
if (!new_option->value)
goto error;
}
break;
case CONFIG_OPTION_TYPE_COLOR:
new_option->string_values = NULL;
new_option->min = min;
new_option->max = gui_color_get_number () - 1;
if (default_value)
{
new_option->default_value = malloc (sizeof (int));
if (!new_option->default_value)
goto error;
if (!gui_color_assign (new_option->default_value, default_value))
*((int *)new_option->default_value) = 0;
}
if (value)
{
new_option->value = malloc (sizeof (int));
if (!new_option->value)
goto error;
if (!gui_color_assign (new_option->value, value))
*((int *)new_option->value) = 0;
}
@ -514,6 +595,14 @@ config_file_new_option (struct t_config_file *config_file,
}
return new_option;
error:
if (new_option)
{
config_file_option_free_data (new_option);
free (new_option);
}
return NULL;
}
/*
@ -786,11 +875,14 @@ config_file_option_reset (struct t_config_option *option, int run_callback)
if (!option->value)
{
option->value = malloc (sizeof (int));
CONFIG_BOOLEAN(option) = CONFIG_BOOLEAN_DEFAULT(option);
snprintf (value, sizeof (value), "%s",
CONFIG_BOOLEAN(option) ?
config_boolean_true[0] : config_boolean_false[0]);
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
if (option->value)
{
CONFIG_BOOLEAN(option) = CONFIG_BOOLEAN_DEFAULT(option);
snprintf (value, sizeof (value), "%s",
CONFIG_BOOLEAN(option) ?
config_boolean_true[0] : config_boolean_false[0]);
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
}
else
{
@ -810,7 +902,8 @@ config_file_option_reset (struct t_config_option *option, int run_callback)
if (!option->value)
{
option->value = malloc (sizeof (int));
CONFIG_INTEGER(option) = 0;
if (option->value)
CONFIG_INTEGER(option) = 0;
}
if (CONFIG_INTEGER(option) == CONFIG_INTEGER_DEFAULT(option))
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
@ -846,7 +939,8 @@ config_file_option_reset (struct t_config_option *option, int run_callback)
if (!option->value)
{
option->value = malloc (sizeof (int));
CONFIG_INTEGER(option) = 0;
if (option->value)
CONFIG_INTEGER(option) = 0;
}
if (CONFIG_COLOR(option) == CONFIG_COLOR_DEFAULT(option))
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
@ -940,17 +1034,20 @@ config_file_option_set (struct t_config_option *option, const char *value,
if (!option->value)
{
option->value = malloc (sizeof (int));
if (string_strcasecmp (value, "toggle") == 0)
CONFIG_BOOLEAN(option) = CONFIG_BOOLEAN_TRUE;
else
if (option->value)
{
if (config_file_string_boolean_is_valid (value))
if (string_strcasecmp (value, "toggle") == 0)
CONFIG_BOOLEAN(option) = CONFIG_BOOLEAN_TRUE;
else
{
value_int = config_file_string_to_boolean (value);
CONFIG_BOOLEAN(option) = value_int;
if (config_file_string_boolean_is_valid (value))
{
value_int = config_file_string_to_boolean (value);
CONFIG_BOOLEAN(option) = value_int;
}
}
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
else
{
@ -979,103 +1076,104 @@ config_file_option_set (struct t_config_option *option, const char *value,
break;
case CONFIG_OPTION_TYPE_INTEGER:
if (!option->value)
{
option->value = malloc (sizeof (int));
CONFIG_INTEGER(option) = 0;
}
if (option->string_values)
if (option->value)
{
value_int = -1;
if (strncmp (value, "++", 2) == 0)
CONFIG_INTEGER(option) = 0;
if (option->string_values)
{
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
value_int = -1;
if (strncmp (value, "++", 2) == 0)
{
number = number % (option->max + 1);
value_int = (CONFIG_INTEGER(option) + number) %
(option->max + 1);
}
}
else if (strncmp (value, "--", 2) == 0)
{
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
{
number = number % (option->max + 1);
value_int = (CONFIG_INTEGER(option) + (option->max + 1) - number) %
(option->max + 1);
}
}
else
{
for (i = 0; option->string_values[i]; i++)
{
if (string_strcasecmp (option->string_values[i],
value) == 0)
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
{
value_int = i;
break;
number = number % (option->max + 1);
value_int = (CONFIG_INTEGER(option) + number) %
(option->max + 1);
}
}
else if (strncmp (value, "--", 2) == 0)
{
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
{
number = number % (option->max + 1);
value_int = (CONFIG_INTEGER(option) + (option->max + 1) - number) %
(option->max + 1);
}
}
else
{
for (i = 0; option->string_values[i]; i++)
{
if (string_strcasecmp (option->string_values[i],
value) == 0)
{
value_int = i;
break;
}
}
}
if (value_int >= 0)
{
if (value_int == CONFIG_INTEGER(option))
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
else
{
CONFIG_INTEGER(option) = value_int;
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
}
}
if (value_int >= 0)
{
if (value_int == CONFIG_INTEGER(option))
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
else
{
CONFIG_INTEGER(option) = value_int;
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
}
}
else
{
new_value_ok = 0;
if (strncmp (value, "++", 2) == 0)
{
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
{
value_int = CONFIG_INTEGER(option) + number;
if (value_int <= option->max)
new_value_ok = 1;
}
}
else if (strncmp (value, "--", 2) == 0)
{
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
{
value_int = CONFIG_INTEGER(option) - number;
if (value_int >= option->min)
new_value_ok = 1;
}
}
else
{
error = NULL;
number = strtol (value, &error, 10);
if (error && !error[0])
new_value_ok = 0;
if (strncmp (value, "++", 2) == 0)
{
value_int = number;
if ((value_int >= option->min)
&& (value_int <= option->max))
new_value_ok = 1;
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
{
value_int = CONFIG_INTEGER(option) + number;
if (value_int <= option->max)
new_value_ok = 1;
}
}
else if (strncmp (value, "--", 2) == 0)
{
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
{
value_int = CONFIG_INTEGER(option) - number;
if (value_int >= option->min)
new_value_ok = 1;
}
}
}
if (new_value_ok)
{
if (value_int == CONFIG_INTEGER(option))
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
else
{
CONFIG_INTEGER(option) = value_int;
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
error = NULL;
number = strtol (value, &error, 10);
if (error && !error[0])
{
value_int = number;
if ((value_int >= option->min)
&& (value_int <= option->max))
new_value_ok = 1;
}
}
if (new_value_ok)
{
if (value_int == CONFIG_INTEGER(option))
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
else
{
CONFIG_INTEGER(option) = value_int;
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
}
}
}
@ -1096,45 +1194,46 @@ config_file_option_set (struct t_config_option *option, const char *value,
break;
case CONFIG_OPTION_TYPE_COLOR:
if (!option->value)
{
option->value = malloc (sizeof (int));
if (option->value)
{
CONFIG_COLOR(option) = 0;
}
value_int = -1;
if (strncmp (value, "++", 2) == 0)
{
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
value_int = -1;
if (strncmp (value, "++", 2) == 0)
{
number = number % (option->max + 1);
value_int = (CONFIG_COLOR(option) + number) %
(option->max + 1);
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
{
number = number % (option->max + 1);
value_int = (CONFIG_COLOR(option) + number) %
(option->max + 1);
}
}
}
else if (strncmp (value, "--", 2) == 0)
{
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
else if (strncmp (value, "--", 2) == 0)
{
number = number % (option->max + 1);
value_int = (CONFIG_COLOR(option) + (option->max + 1) - number) %
(option->max + 1);
error = NULL;
number = strtol (value + 2, &error, 10);
if (error && !error[0])
{
number = number % (option->max + 1);
value_int = (CONFIG_COLOR(option) + (option->max + 1) - number) %
(option->max + 1);
}
}
}
else
{
gui_color_assign (&value_int, value);
}
if (value_int >= 0)
{
if (value_int == CONFIG_COLOR(option))
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
else
{
CONFIG_COLOR(option) = value_int;
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
gui_color_assign (&value_int, value);
}
if (value_int >= 0)
{
if (value_int == CONFIG_COLOR(option))
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
else
{
CONFIG_COLOR(option) = value_int;
rc = WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
}
}
}
break;
@ -1318,31 +1417,37 @@ void
config_file_option_rename (struct t_config_option *option,
const char *new_name)
{
char *str_new_name;
if (!option || !new_name || !new_name[0]
|| config_file_search_option (option->config_file, option->section, new_name))
return;
/* remove option from list */
if (option->section)
{
if (option->prev_option)
(option->prev_option)->next_option = option->next_option;
if (option->next_option)
(option->next_option)->prev_option = option->prev_option;
if (option->section->options == option)
(option->section)->options = option->next_option;
if (option->section->last_option == option)
(option->section)->last_option = option->prev_option;
}
/* rename option */
if (option->name)
free (option->name);
option->name = strdup (new_name);
/* re-insert option in section */
if (option->section)
config_file_option_insert_in_section (option);
str_new_name = strdup (new_name);
if (str_new_name)
{
/* remove option from list */
if (option->section)
{
if (option->prev_option)
(option->prev_option)->next_option = option->next_option;
if (option->next_option)
(option->next_option)->prev_option = option->prev_option;
if (option->section->options == option)
(option->section)->options = option->next_option;
if (option->section->last_option == option)
(option->section)->last_option = option->prev_option;
}
/* rename option */
if (option->name)
free (option->name);
option->name = str_new_name;
/* re-insert option in section */
if (option->section)
config_file_option_insert_in_section (option);
}
}
/*

12
src/core/wee-config.c
View File

@ -960,13 +960,15 @@ config_weechat_key_write_cb (void *data, struct t_config_file *config_file,
for (ptr_key = gui_keys; ptr_key; ptr_key = ptr_key->next_key)
{
expanded_name = gui_keyboard_get_expanded_name (ptr_key->key);
config_file_write_line (config_file,
(expanded_name) ?
expanded_name : ptr_key->key,
"\"%s\"",
ptr_key->command);
if (expanded_name)
{
config_file_write_line (config_file,
(expanded_name) ?
expanded_name : ptr_key->key,
"\"%s\"",
ptr_key->command);
free (expanded_name);
}
}
}

84
src/core/wee-string.c
View File

@ -785,7 +785,7 @@ char **
string_explode (const char *string, const char *separators, int keep_eol,
int num_items_max, int *num_items)
{
int i, n_items;
int i, j, n_items;
char *string2, **array;
char *ptr, *ptr1, *ptr2;
@ -816,6 +816,8 @@ string_explode (const char *string, const char *separators, int keep_eol,
n_items = num_items_max;
array = malloc ((n_items + 1) * sizeof (array[0]));
if (!array)
return NULL;
ptr1 = string2;
ptr2 = string2;
@ -857,10 +859,32 @@ string_explode (const char *string, const char *separators, int keep_eol,
if (keep_eol)
{
array[i] = strdup (ptr1);
if (!array[i])
{
for (j = 0; j < n_items; j++)
{
if (array[j])
free (array[j]);
}
free (array);
free (string2);
return NULL;
}
}
else
{
array[i] = malloc (ptr2 - ptr1 + 1);
if (!array[i])
{
for (j = 0; j < n_items; j++)
{
if (array[j])
free (array[j]);
}
free (array);
free (string2);
return NULL;
}
strncpy (array[i], ptr1, ptr2 - ptr1);
array[i][ptr2 - ptr1] = '\0';
}
@ -1068,10 +1092,14 @@ string_iconv (int from_utf8, const char *from_code, const char *to_code,
else
{
inbuf = strdup (string);
if (!inbuf)
return NULL;
ptr_inbuf = inbuf;
inbytesleft = strlen (inbuf);
outbytesleft = inbytesleft * 4;
outbuf = malloc (outbytesleft + 2);
if (!outbuf)
return inbuf;
ptr_outbuf = outbuf;
ptr_inbuf_shift = NULL;
done = 0;
@ -1162,27 +1190,27 @@ string_iconv_to_internal (const char *charset, const char *string)
return NULL;
input = strdup (string);
if (!input)
return NULL;
/* optimize for UTF-8: if charset is NULL => we use term charset =>
if ths charset is already UTF-8, then no iconv needed */
if (local_utf8 && (!charset || !charset[0]))
return input;
if (input)
{
if (utf8_has_8bits (input) && utf8_is_valid (input, NULL))
return input;
output = string_iconv (0,
(charset && charset[0]) ?
charset : weechat_local_charset,
WEECHAT_INTERNAL_CHARSET,
input);
utf8_normalize (output, '?');
free (input);
return output;
}
return NULL;
if (utf8_has_8bits (input) && utf8_is_valid (input, NULL))
return input;
output = string_iconv (0,
(charset && charset[0]) ?
charset : weechat_local_charset,
WEECHAT_INTERNAL_CHARSET,
input);
if (!output)
return input;
utf8_normalize (output, '?');
free (input);
return output;
}
/*
@ -1200,24 +1228,24 @@ string_iconv_from_internal (const char *charset, const char *string)
return NULL;
input = strdup (string);
if (!input)
return NULL;
/* optimize for UTF-8: if charset is NULL => we use term charset =>
if ths charset is already UTF-8, then no iconv needed */
if (local_utf8 && (!charset || !charset[0]))
return input;
if (input)
{
utf8_normalize (input, '?');
output = string_iconv (1,
WEECHAT_INTERNAL_CHARSET,
(charset && charset[0]) ?
charset : weechat_local_charset,
input);
free (input);
return output;
}
return NULL;
utf8_normalize (input, '?');
output = string_iconv (1,
WEECHAT_INTERNAL_CHARSET,
(charset && charset[0]) ?
charset : weechat_local_charset,
input);
if (!output)
return input;
free (input);
return output;
}
/*

121
src/gui/gui-bar-window.c
View File

@ -243,29 +243,74 @@ gui_bar_window_content_alloc (struct t_gui_bar_window *bar_window)
int i, j;
bar_window->items_count = bar_window->bar->items_count;
bar_window->items_subcount = NULL;
bar_window->items_content = NULL;
bar_window->items_refresh_needed = NULL;
bar_window->items_subcount = malloc (bar_window->items_count *
sizeof (*bar_window->items_subcount));
if (!bar_window->items_subcount)
goto error;
bar_window->items_content = malloc ((bar_window->items_count) *
sizeof (*bar_window->items_content));
if (!bar_window->items_content)
goto error;
bar_window->items_refresh_needed = malloc (bar_window->items_count *
sizeof (*bar_window->items_refresh_needed));
if (!bar_window->items_refresh_needed)
goto error;
for (i = 0; i < bar_window->items_count; i++)
{
bar_window->items_content[i] = NULL;
bar_window->items_refresh_needed[i] = NULL;
}
for (i = 0; i < bar_window->items_count; i++)
{
bar_window->items_subcount[i] = bar_window->bar->items_subcount[i];
bar_window->items_content[i] = malloc (bar_window->items_subcount[i] *
sizeof (**bar_window->items_content));
if (!bar_window->items_content[i])
goto error;
bar_window->items_refresh_needed[i] = malloc (bar_window->items_subcount[i] *
sizeof (**bar_window->items_refresh_needed));
if (!bar_window->items_refresh_needed[i])
goto error;
for (j = 0; j < bar_window->items_subcount[i]; j++)
{
if (bar_window->items_content[i])
bar_window->items_content[i][j] = NULL;
if (bar_window->items_refresh_needed[i])
bar_window->items_refresh_needed[i][j] = 1;
}
}
return;
error:
if (bar_window->items_subcount)
{
free (bar_window->items_subcount);
bar_window->items_subcount = NULL;
}
if (bar_window->items_content)
{
for (i = 0; i < bar_window->items_count; i++)
{
bar_window->items_subcount[i] = bar_window->bar->items_subcount[i];
bar_window->items_content[i] = malloc (bar_window->items_subcount[i] *
sizeof (**bar_window->items_content));
bar_window->items_refresh_needed[i] = malloc (bar_window->items_subcount[i] *
sizeof (**bar_window->items_refresh_needed));
for (j = 0; j < bar_window->items_subcount[i]; j++)
{
if (bar_window->items_content[i])
bar_window->items_content[i][j] = NULL;
if (bar_window->items_refresh_needed[i])
bar_window->items_refresh_needed[i][j] = 1;
}
if (bar_window->items_content[i])
free (bar_window->items_content[i]);
}
free (bar_window->items_content);
bar_window->items_content = NULL;
}
if (bar_window->items_refresh_needed)
{
for (i = 0; i < bar_window->items_count; i++)
{
if (bar_window->items_refresh_needed[i])
free (bar_window->items_refresh_needed[i]);
}
free (bar_window->items_refresh_needed);
bar_window->items_refresh_needed = NULL;
}
}
@ -314,20 +359,23 @@ gui_bar_window_content_build_item (struct t_gui_bar_window *bar_window,
struct t_gui_window *window,
int index_item, int index_subitem)
{
if (bar_window->items_content[index_item][index_subitem])
if (bar_window->items_content)
{
free (bar_window->items_content[index_item][index_subitem]);
bar_window->items_content[index_item][index_subitem] = NULL;
}
/* build item, but only if there's a buffer in window */
if ((window && window->buffer)
|| (gui_current_window && gui_current_window->buffer))
{
bar_window->items_content[index_item][index_subitem] =
gui_bar_item_get_value (bar_window->bar->items_array[index_item][index_subitem],
bar_window->bar, window);
bar_window->items_refresh_needed[index_item][index_subitem] = 0;
if (bar_window->items_content[index_item][index_subitem])
{
free (bar_window->items_content[index_item][index_subitem]);
bar_window->items_content[index_item][index_subitem] = NULL;
}
/* build item, but only if there's a buffer in window */
if ((window && window->buffer)
|| (gui_current_window && gui_current_window->buffer))
{
bar_window->items_content[index_item][index_subitem] =
gui_bar_item_get_value (bar_window->bar->items_array[index_item][index_subitem],
bar_window->bar, window);
bar_window->items_refresh_needed[index_item][index_subitem] = 0;
}
}
}
@ -393,6 +441,10 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
int length_reinit_color, length_reinit_color_space;
int length, max_length, max_length_screen, total_items, columns, lines;
if (!bar_window->items_subcount || !bar_window->items_content
|| !bar_window->items_refresh_needed)
return NULL;
snprintf (reinit_color, sizeof (reinit_color),
"%c%c%02d,%02d",
GUI_COLOR_COLOR_CHAR,
@ -1083,13 +1135,20 @@ gui_bar_window_print_log (struct t_gui_bar_window *bar_window)
{
log_printf (" items_subcount[%03d]. . : %d",
i, bar_window->items_subcount[i]);
for (j = 0; j < bar_window->items_subcount[i]; j++)
if (bar_window->items_content && bar_window->bar->items_array)
{
log_printf (" items_content[%03d][%03d]: '%s' (item: '%s')",
i, j,
bar_window->items_content[i][j],
(bar_window->items_count >= i + 1) ?
bar_window->bar->items_array[i][j] : "?");
for (j = 0; j < bar_window->items_subcount[i]; j++)
{
log_printf (" items_content[%03d][%03d]: '%s' (item: '%s')",
i, j,
bar_window->items_content[i][j],
(bar_window->items_count >= i + 1) ?
bar_window->bar->items_array[i][j] : "?");
}
}
else
{
log_printf (" items_content. . . . . . : 0x%lx", bar_window->items_content);
}
}
log_printf (" gui_objects. . . . . . : 0x%lx", bar_window->gui_objects);

12
src/gui/gui-keyboard.c
View File

@ -179,7 +179,11 @@ gui_keyboard_get_expanded_name (const char *key)
{
char *result;
if ((result = malloc ((strlen (key) * 5) + 1)))
if (!key)
return NULL;
result = malloc ((strlen (key) * 5) + 1);
if (result)
{
result[0] = '\0';
while (key[0])
@ -206,9 +210,7 @@ gui_keyboard_get_expanded_name (const char *key)
}
}
}
else
return NULL;
return result;
}
@ -354,7 +356,7 @@ gui_keyboard_search_part (struct t_gui_buffer *buffer, const char *key)
for (ptr_key = (buffer) ? buffer->keys : gui_keys; ptr_key;
ptr_key = ptr_key->next_key)
{
if (gui_keyboard_cmp (ptr_key->key, key) == 0)
if (ptr_key->key && (gui_keyboard_cmp (ptr_key->key, key) == 0))
return ptr_key;
}