From 35d238ad3a48b07c0c204b22305f00805c190111 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Thu, 28 Jan 2016 22:49:23 -0500 Subject: Properly handle a few args optionally starting with : This is a pervasive problem that will likely show up in other events also. Closes #1460 --- src/common/proto-irc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c index 57dc587b..6fe601ed 100644 --- a/src/common/proto-irc.c +++ b/src/common/proto-irc.c @@ -569,7 +569,8 @@ process_numeric (session * sess, int n, inbound_user_info_start (sess, word[4], tags_data); if (!serv->skip_next_whois) EMIT_SIGNAL_TIMESTAMP (XP_TE_WHOIS1, whois_sess, word[4], word[5], - word[6], word_eol[8] + 1, 0, tags_data->timestamp); + word[6], (word_eol[8][0] == ':') ? word_eol[8] + 1 : word_eol[8], + 0, tags_data->timestamp); else inbound_user_info (sess, NULL, word[5], word[6], NULL, word[4], word_eol[8][0] == ':' ? word_eol[8] + 1 : word_eol[8], @@ -679,7 +680,7 @@ process_numeric (session * sess, int n, sess = find_channel (serv, word[4]); if (sess) { - EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANURL, sess, word[4], word[5] + 1, + EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANURL, sess, word[4], (word_eol[5][0] == ':') ? word_eol[5] + 1 : word_eol[5], NULL, NULL, 0, tags_data->timestamp); } break; -- cgit 1.4.1