commit 52ccba5d1e8cd2e648cf3c14598332bde6b9910d from: Alexander Barton date: Sun Dec 13 20:53:53 2015 UTC IRC_KillClient(): Don't break when called without "Client" The IRC_KillClient() function is documented to handle the case that the "Client" structure is NULL, so make sure that this actually works and can't crash the daemon. Please note: The current code doesn't make use of this feature, so this fix is definitely the "right" thing to do but doesn't fix an actual problem. commit - 98e9467c85b1a81fbbcebf2be21b3a0d83fb60c4 commit + 52ccba5d1e8cd2e648cf3c14598332bde6b9910d blob - cfe616f5f33ac9845c9cfbdf92392f183bfdc9a8 blob + ad8c0506905eca3fdaf5787914be740b7a4b9e21 --- src/ngircd/irc.c +++ src/ngircd/irc.c @@ -339,8 +339,11 @@ GLOBAL bool IRC_KillClient(CLIENT *Client, CLIENT *From, const char *Nick, const char *Reason) { const char *msg; - CONN_ID my_conn, conn; + CONN_ID my_conn = NONE, conn; CLIENT *c; + + assert(Nick != NULL); + assert(Reason != NULL); /* Do we know such a client in the network? */ c = Client_Search(Nick); @@ -376,7 +379,8 @@ IRC_KillClient(CLIENT *Client, CLIENT *From, const cha } /* Save ID of this connection */ - my_conn = Client_Conn(Client); + if (Client) + my_conn = Client_Conn(Client); /* Kill the client NOW: * - Close the local connection (if there is one),