PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-26 13:01:11 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'd-minor' into 'master'

Browse Source 
Prevent some potential null-pointer deferences.

See merge request !9
(cherry picked from commit 7ef22687f9291ef10072cc55bc64e3db3ad5a546)
This commit is contained in:
Nei 2017-03-04 20:35:17 +00:00 committed by Ailin Nemui
parent dfffb0e9d8
commit 554586cddf
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-common/core/fe-channels.c
View File

@ -453,7 +453,7 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist)
} }
} }
if (str->len > strlen(prefix_format)) { if (prefix_format != NULL && str->len > strlen(prefix_format)) {
printtext(channel->server, channel->visible_name, printtext(channel->server, channel->visible_name,
MSGLEVEL_CLIENTCRAP, "%s", str->str); MSGLEVEL_CLIENTCRAP, "%s", str->str);
} }

2
src/fe-common/irc/fe-netsplit.c
View File

@ -148,6 +148,8 @@ static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, con
char *sourceserver; char *sourceserver;
GSList *tmp; GSList *tmp;
g_return_if_fail(rec->servers != NULL);
destservers = g_string_new(NULL); destservers = g_string_new(NULL);
for (tmp = rec->servers; tmp != NULL; tmp = tmp->next) { for (tmp = rec->servers; tmp != NULL; tmp = tmp->next) {
NETSPLIT_SERVER_REC *rec = tmp->data; NETSPLIT_SERVER_REC *rec = tmp->data;

2
src/fe-text/mainwindows-layout.c
View File

@ -121,6 +121,8 @@ static void sig_layout_restore(void)
if (node == NULL) return; if (node == NULL) return;
sorted_config = get_sorted_windows_config(node); sorted_config = get_sorted_windows_config(node);
if (sorted_config == NULL) return;
windows_count = g_slist_length(sorted_config); windows_count = g_slist_length(sorted_config);
/* calculate the saved terminal height */ /* calculate the saved terminal height */