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

Add extra checks on some pointers

Browse Source
This commit is contained in:
Sebastien Helleu
2010-10-31 18:19:53 +01:00
parent 911f90e792
commit 90589b2d71
5 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gui-bar-item.c
+4 -1
View File
@@ -296,6 +296,9 @@ gui_bar_item_get_value (const char *name, struct t_gui_bar *bar,
struct t_gui_bar_item *ptr_item;
struct t_weechat_plugin *ptr_plugin;
if (!name)
return NULL;
start = NULL;
end = NULL;
prefix = NULL;
@@ -303,7 +306,7 @@ gui_bar_item_get_value (const char *name, struct t_gui_bar *bar,
suffix = NULL;
ptr = name;
while (ptr && ptr[0])
while (ptr[0])
{
valid_char = gui_bar_item_valid_char_name (ptr[0]);
if (!start && valid_char)
src/gui/gui-chat.c
+1 -1
View File
@@ -581,7 +581,7 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
tags, pos_prefix, ptr_msg);
if (ptr_line)
{
if (buffer->print_hooks_enabled)
if (buffer && buffer->print_hooks_enabled)
hook_print_exec (buffer, ptr_line);
if (ptr_line->data->displayed)
at_least_one_message_printed = 1;
src/gui/gui-completion.c
+8 -4
View File
@@ -1977,10 +1977,14 @@ gui_completion_complete (struct t_gui_completion *completion)
NULL);
}
if (completion->direction < 0)
ptr_item = completion->completion_list->last_item;
else
ptr_item = completion->completion_list->items;
ptr_item = NULL;
if (completion->completion_list)
{
if (completion->direction < 0)
ptr_item = completion->completion_list->last_item;
else
ptr_item = completion->completion_list->items;
}
if (partial_completion
&& completion->word_found
src/gui/gui-window.c
+7 -4
View File
@@ -598,10 +598,13 @@ gui_window_scroll (struct t_gui_window *window, char *scroll)
ptr_line = ptr_line->next_line;
}
}
old_date = ptr_line->data->date;
date_tmp = localtime (&old_date);
memcpy (&old_line_date, date_tmp, sizeof (struct tm));
if (ptr_line)
{
old_date = ptr_line->data->date;
date_tmp = localtime (&old_date);
memcpy (&old_line_date, date_tmp, sizeof (struct tm));
}
while (ptr_line)
{
src/plugins/irc/irc-bar-item.c
+6 -6
View File
@@ -235,9 +235,9 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item,
(part_from_channel) ? IRC_COLOR_BAR_DELIM : "",
(part_from_channel) ? "(" : "",
(server && server->ssl_connected) ? IRC_COLOR_STATUS_NAME_SSL : IRC_COLOR_STATUS_NAME,
(display_server) ? server->name : "",
(display_server) ? IRC_COLOR_BAR_DELIM : "",
(display_server) ? "/" : "",
(server && display_server) ? server->name : "",
(server && display_server) ? IRC_COLOR_BAR_DELIM : "",
(server && display_server) ? "/" : "",
(server && server->ssl_connected) ? IRC_COLOR_STATUS_NAME_SSL : IRC_COLOR_STATUS_NAME,
channel->name,
(part_from_channel) ? IRC_COLOR_BAR_DELIM : "",
@@ -344,9 +344,9 @@ irc_bar_item_channel (void *data, struct t_gui_bar_item *item,
(part_from_channel) ? IRC_COLOR_BAR_DELIM : "",
(part_from_channel) ? "(" : "",
IRC_COLOR_STATUS_NAME,
(display_server) ? server->name : "",
(display_server) ? IRC_COLOR_BAR_DELIM : "",
(display_server) ? "/" : "",
(server && display_server) ? server->name : "",
(server && display_server) ? IRC_COLOR_BAR_DELIM : "",
(server && display_server) ? "/" : "",
IRC_COLOR_STATUS_NAME,
channel->name,
(part_from_channel) ? IRC_COLOR_BAR_DELIM : "",