Merge pull request #738 from scumjr/master
irc: fix NULL pointer dereference in 734 command callback
This commit is contained in:
commit
24d9abf46d
@ -5384,8 +5384,13 @@ IRC_PROTOCOL_CALLBACK(733)
|
||||
|
||||
IRC_PROTOCOL_CALLBACK(734)
|
||||
{
|
||||
char *pos_args;
|
||||
|
||||
IRC_PROTOCOL_MIN_ARGS(5);
|
||||
|
||||
pos_args = (argc > 5) ?
|
||||
((argv_eol[5][0] == ':') ? argv_eol[5] + 1 : argv_eol[5]) : NULL;
|
||||
|
||||
weechat_printf_date_tags (
|
||||
irc_msgbuffer_get_target_buffer (
|
||||
server, NULL, command, "monitor", NULL),
|
||||
@ -5393,7 +5398,7 @@ IRC_PROTOCOL_CALLBACK(734)
|
||||
irc_protocol_tags (command, "irc_numeric", NULL, NULL),
|
||||
"%s%s (%s)",
|
||||
weechat_prefix ("error"),
|
||||
(argv_eol[5][0] == ':') ? argv_eol[5] + 1 : argv_eol[5],
|
||||
(pos_args && pos_args[0]) ? pos_args : "",
|
||||
argv[3]);
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
|
Loading…
x
Reference in New Issue
Block a user