summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2018-03-06 06:20:04 +0000
committerGary Kramlich <grim@reaperworld.com>2018-03-06 06:20:04 +0000
commit222769ce99ca3b940fc6d41d3d2c70d5e50e872a (patch)
tree9f39368689eec7a7ae495536f3f57d0f32fcf0b3
parentaaa069a0d50346973b68de62976f1679c9bbbcb6 (diff)
parenta281f3234899cda15675c78c3167778fffc1ee48 (diff)
downloadpidgin-222769ce99ca3b940fc6d41d3d2c70d5e50e872a.tar.gz
Merged in dequisdequis/security/release-2.x.y (pull request #22)
irc: fix read out of bounds in irc_nick_skip_mode Approved-by: Gary Kramlich <grim@reaperworld.com>
-rw-r--r--libpurple/protocols/irc/parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpurple/protocols/irc/parse.c b/libpurple/protocols/irc/parse.c
index c4caa5e933..f1478c8b53 100644
--- a/libpurple/protocols/irc/parse.c
+++ b/libpurple/protocols/irc/parse.c
@@ -533,7 +533,7 @@ const char *irc_nick_skip_mode(struct irc_conn *irc, const char *nick)
mode_chars = irc->mode_chars ? irc->mode_chars : default_modes;
- while (strchr(mode_chars, *nick) != NULL)
+ while (*nick && strchr(mode_chars, *nick) != NULL)
nick++;
return nick;