mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-01-20 20:36:53 +00:00
Code Issues Releases Wiki Activity

IRC_SQUIT(): Fix use-after-free when unregistering the sending client

Browse Source
This commit is contained in:
Alexander Barton 2020-05-26 00:05:22 +02:00
parent 02cf31c0e2
commit d697de3186
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ngircd/irc-server.c
View File

@ -367,7 +367,7 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req)
{ {
char msg[COMMAND_LEN], logmsg[COMMAND_LEN]; char msg[COMMAND_LEN], logmsg[COMMAND_LEN];
CLIENT *from, *target; CLIENT *from, *target;
CONN_ID con; CONN_ID con, client_con;
int loglevel; int loglevel;
assert(Client != NULL); assert(Client != NULL);
@ -407,6 +407,7 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req)
return CONNECTED; return CONNECTED;
} }
client_con = Client_Conn(Client);
con = Client_Conn(target); con = Client_Conn(target);
if (Req->argv[1][0]) if (Req->argv[1][0])
@ -428,7 +429,7 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req)
Req->argv[0], Client_ID(from), Req->argv[0], Client_ID(from),
Req->argv[1][0] ? Req->argv[1] : "-"); Req->argv[1][0] ? Req->argv[1] : "-");
Conn_Close(con, NULL, msg, true); Conn_Close(con, NULL, msg, true);
if (con == Client_Conn(Client)) if (con == client_con)
return DISCONNECTED; return DISCONNECTED;
} else { } else {
/* This server is not directly connected, so the SQUIT must /* This server is not directly connected, so the SQUIT must