diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/fe-common/core/fe-channels.c | 2 | ||||
| -rw-r--r-- | src/fe-common/irc/fe-netsplit.c | 2 | ||||
| -rw-r--r-- | src/fe-text/mainwindows-layout.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c index 00aac885..8e434ab5 100644 --- a/src/fe-common/core/fe-channels.c +++ b/src/fe-common/core/fe-channels.c @@ -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, MSGLEVEL_CLIENTCRAP, "%s", str->str); } diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c index 17fb1994..4c69dd10 100644 --- a/src/fe-common/irc/fe-netsplit.c +++ b/src/fe-common/irc/fe-netsplit.c @@ -148,6 +148,8 @@ static void print_server_splits(IRC_SERVER_REC *server, TEMP_SPLIT_REC *rec, con char *sourceserver; GSList *tmp; + g_return_if_fail(rec->servers != NULL); + destservers = g_string_new(NULL); for (tmp = rec->servers; tmp != NULL; tmp = tmp->next) { NETSPLIT_SERVER_REC *rec = tmp->data; diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c index 020969e6..fae02539 100644 --- a/src/fe-text/mainwindows-layout.c +++ b/src/fe-text/mainwindows-layout.c @@ -121,6 +121,8 @@ static void sig_layout_restore(void) if (node == NULL) return; sorted_config = get_sorted_windows_config(node); + if (sorted_config == NULL) return; + windows_count = g_slist_length(sorted_config); /* calculate the saved terminal height */ |