blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

irc: fix parsing of message 324 (modes) when there is a colon before the modes (closes #913)

Browse Source
This commit is contained in:
Sébastien Helleu 2017-02-19 08:12:25 +01:00
parent e52400841a
commit e6d5d791cd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.adoc
View File

@ -32,6 +32,7 @@ Improvements::
Bug fixes::
* core: fix delayed refresh when the signal SIGWINCH is received (terminal resized) (issue #902)
* irc: fix parsing of message 324 (modes) when there is a colon before the modes (issue #913)
Build::

9
src/plugins/irc/irc-protocol.c
View File

@ -3278,14 +3278,18 @@ IRC_PROTOCOL_CALLBACK(323)
IRC_PROTOCOL_CALLBACK(324)
{
const char *ptr_modes;
struct t_irc_channel *ptr_channel;
ptr_modes = (argc > 4) ?
((argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]) : NULL;
IRC_PROTOCOL_MIN_ARGS(4);
ptr_channel = irc_channel_search (server, argv[3]);
if (ptr_channel)
{
irc_channel_set_modes (ptr_channel, ((argc > 4) ? argv_eol[4] : NULL));
irc_channel_set_modes (ptr_channel, ptr_modes);
if (argc > 4)
{
(void) irc_mode_channel_set (server, ptr_channel,
@ -3308,8 +3312,7 @@ IRC_PROTOCOL_CALLBACK(324)
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(argc > 4) ?
((argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]) : "",
(ptr_modes) ? ptr_modes : "",
IRC_COLOR_CHAT_DELIMITERS);
}