vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix privmsg/notice send functions to use variable argument lists properly

Browse source
This commit is contained in:
Simon Arlott 2016-11-25 16:19:29 +00:00
parent a49b954f98
commit 6396c5da07
No known key found for this signature in database
GPG key ID: C8975F2043CA5D24
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ircd/send.c
View file

@ -1186,19 +1186,16 @@ sendto_monitor(struct monitor *monptr, const char *pattern, ...)
static void static void
_sendto_anywhere(struct Client *dest_p, struct Client *target_p, _sendto_anywhere(struct Client *dest_p, struct Client *target_p,
struct Client *source_p, const char *command, struct Client *source_p, const char *command,
const char *pattern, ...) const char *pattern, va_list *args)
{ {
va_list args;
buf_head_t linebuf; buf_head_t linebuf;
rb_linebuf_newbuf(&linebuf); rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
if(MyClient(dest_p)) if(MyClient(dest_p))
{ {
if(IsServer(source_p)) if(IsServer(source_p))
rb_linebuf_putmsg(&linebuf, pattern, &args, ":%s %s %s ", rb_linebuf_putmsg(&linebuf, pattern, args, ":%s %s %s ",
source_p->name, command, source_p->name, command,
target_p->name); target_p->name);
else else
@ -1208,14 +1205,13 @@ _sendto_anywhere(struct Client *dest_p, struct Client *target_p,
build_msgbuf_from(&msgbuf, source_p, command); build_msgbuf_from(&msgbuf, source_p, command);
msgbuf.target = target_p->name; msgbuf.target = target_p->name;
linebuf_put_msgvbuf(&msgbuf, &linebuf, dest_p->localClient->caps, pattern, &args); linebuf_put_msgvbuf(&msgbuf, &linebuf, dest_p->localClient->caps, pattern, args);
} }
} }
else else
rb_linebuf_putmsg(&linebuf, pattern, &args, ":%s %s %s ", rb_linebuf_putmsg(&linebuf, pattern, args, ":%s %s %s ",
get_id(source_p, target_p), command, get_id(source_p, target_p), command,
get_id(target_p, target_p)); get_id(target_p, target_p));
va_end(args);
if(MyClient(dest_p)) if(MyClient(dest_p))
_send_linebuf(dest_p, &linebuf); _send_linebuf(dest_p, &linebuf);
@ -1235,7 +1231,11 @@ void
sendto_anywhere(struct Client *target_p, struct Client *source_p, sendto_anywhere(struct Client *target_p, struct Client *source_p,
const char *command, const char *pattern, ...) const char *command, const char *pattern, ...)
{ {
_sendto_anywhere(target_p, target_p, source_p, command, pattern); va_list args;
va_start(args, pattern);
_sendto_anywhere(target_p, target_p, source_p, command, pattern, &args);
va_end(args);
} }
/* sendto_anywhere_echo() /* sendto_anywhere_echo()
@ -1248,10 +1248,14 @@ void
sendto_anywhere_echo(struct Client *target_p, struct Client *source_p, sendto_anywhere_echo(struct Client *target_p, struct Client *source_p,
const char *command, const char *pattern, ...) const char *command, const char *pattern, ...)
{ {
va_list args;
s_assert(MyClient(source_p)); s_assert(MyClient(source_p));
s_assert(!IsServer(source_p)); s_assert(!IsServer(source_p));
_sendto_anywhere(source_p, target_p, source_p, command, pattern); va_start(args, pattern);
_sendto_anywhere(source_p, target_p, source_p, command, pattern, &args);
va_end(args);
} }
/* sendto_realops_snomask() /* sendto_realops_snomask()