summaryrefslogtreecommitdiff
path: root/src/fe-common/core
diff options
context:
space:
mode:
authorNei <ailin.nemui@gmail.com>2017-03-04 20:35:17 +0000
committerNei <ailin.nemui@gmail.com>2017-03-04 20:35:17 +0000
commit7ef22687f9291ef10072cc55bc64e3db3ad5a546 (patch)
tree81d112e872b10ba5146f3a48962eea24ae8502f4 /src/fe-common/core
parent647ef193a896cc8a97d9bc664a6337b8b779f3c4 (diff)
parent98ead50b4eea7cda4b357f1c4b19a741205c6fa4 (diff)
downloadirssi-7ef22687f9291ef10072cc55bc64e3db3ad5a546.zip
Merge branch 'd-minor' into 'master'
Prevent some potential null-pointer deferences. See merge request !9
Diffstat (limited to 'src/fe-common/core')
-rw-r--r--src/fe-common/core/fe-channels.c2
1 files changed, 1 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);
}