pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-08 10:43:13 +02:00
Code Activity

core: remove check of NULL pointers before calling string_free_split() (issue #865)

Browse Source
This commit is contained in:
Sébastien Helleu
2024-04-25 19:09:11 +02:00
parent 9a5a1fb300
commit 3057d846d9
21 changed files with 36 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/curses/gui-curses-bar-window.c
+1 -2
View File
@@ -877,8 +877,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window,
}
}
}
if (items)
string_free_split (items);
string_free_split (items);
free (content);
}
else
src/gui/gui-bar-window.c
+1 -2
View File
@@ -965,8 +965,7 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
{
for (sub = 0; sub < bar_window->items_subcount[i]; sub++)
{
if (split_items[i][sub])
string_free_split (split_items[i][sub]);
string_free_split (split_items[i][sub]);
}
free (split_items[i]);
}
src/gui/gui-bar.c
+1 -2
View File
@@ -684,8 +684,7 @@ gui_bar_free_items_arrays (struct t_gui_bar *bar)
for (i = 0; i < bar->items_count; i++)
{
if (bar->items_array[i])
string_free_split (bar->items_array[i]);
string_free_split (bar->items_array[i]);
for (j = 0; j < bar->items_subcount[i]; j++)
{
free (bar->items_buffer[i][j]);
src/gui/gui-buffer.c
+4 -8
View File
@@ -1908,10 +1908,8 @@ gui_buffer_add_highlight_words (struct t_gui_buffer *buffer,
weelist_free (list);
if (current_words)
string_free_split (current_words);
if (add_words)
string_free_split (add_words);
string_free_split (current_words);
string_free_split (add_words);
}
/*
@@ -1964,10 +1962,8 @@ gui_buffer_remove_highlight_words (struct t_gui_buffer *buffer,
weelist_free (list);
if (current_words)
string_free_split (current_words);
if (remove_words)
string_free_split (remove_words);
string_free_split (current_words);
string_free_split (remove_words);
}
/*
src/gui/gui-color.c
+1 -2
View File
@@ -1183,8 +1183,7 @@ gui_color_decode_ansi_cb (void *data, const char *text)
}
end:
if (items)
string_free_split (items);
string_free_split (items);
free (text2);
return (output) ? output : strdup ("");
src/gui/gui-filter.c
+1 -2
View File
@@ -540,8 +540,7 @@ gui_filter_free (struct t_gui_filter *filter)
/* free data */
free (filter->name);
free (filter->buffer_name);
if (filter->buffers)
string_free_split (filter->buffers);
string_free_split (filter->buffers);
free (filter->tags);
if (filter->tags_array)
string_free_split_tags (filter->tags_array);
src/gui/gui-key.c
+3 -6
View File
@@ -2494,10 +2494,8 @@ gui_key_pressed (const char *key_str)
break;
}
if (chunks1)
string_free_split (chunks1);
if (chunks2)
string_free_split (chunks2);
string_free_split (chunks1);
string_free_split (chunks2);
if (ptr_key)
{
@@ -2635,8 +2633,7 @@ gui_key_free (int context,
/* free memory */
free (key->key);
if (key->chunks)
string_free_split (key->chunks);
string_free_split (key->chunks);
for (i = 0; i < 2; i++)
{
free (key->area_name[i]);
src/gui/gui-nick.c
+1 -2
View File
@@ -324,8 +324,7 @@ gui_nick_find_color_name (const char *nickname, int case_range,
end:
result = strdup ((ptr_result) ? ptr_result : default_color);
if (list_colors)
string_free_split (list_colors);
string_free_split (list_colors);
free (nickname2);
free (nickname3);
return result;