Read_Request(): don't access possibly free'd CLIENT structure

Handle_Buffer() can shut down connections and remove clients, so after
calling it, we have to make sure that our CLIENT pointer is still valid.

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 98a054344031d57c0c9e82b98fd4a66d46d3d200..af79c13feddbbb208a2b887aafef7e73a5e4c95f 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1455,16 +1455,21 @@ Read_Request( CONN_ID Idx )
 
        /* Update connection statistics */
        My_Connections[Idx].bytes_in += len;
 
        /* Update connection statistics */
        My_Connections[Idx].bytes_in += len;

+       My_Connections[Idx].bps += Handle_Buffer(Idx);
+
+       /* Make sure that there is still a valid client registered */
+       c = Conn_GetClient(Idx);
+       if (!c)
+               return;

 
        /* Update timestamp of last data received if this connection is
         * registered as a user, server or service connection. Don't update
         * otherwise, so users have at least Conf_PongTimeout seconds time to
         * register with the IRC server -- see Check_Connections().
         * Update "lastping", too, if time shifted backwards ... */
 
        /* Update timestamp of last data received if this connection is
         * registered as a user, server or service connection. Don't update
         * otherwise, so users have at least Conf_PongTimeout seconds time to
         * register with the IRC server -- see Check_Connections().
         * Update "lastping", too, if time shifted backwards ... */

-       c = Conn_GetClient(Idx);
-       if (c && (Client_Type(c) == CLIENT_USER
-                 || Client_Type(c) == CLIENT_SERVER
-                 || Client_Type(c) == CLIENT_SERVICE)) {
+       if (Client_Type(c) == CLIENT_USER
+           || Client_Type(c) == CLIENT_SERVER
+           || Client_Type(c) == CLIENT_SERVICE) {

                t = time(NULL);
                if (My_Connections[Idx].lastdata != t)
                        My_Connections[Idx].bps = 0;
                t = time(NULL);
                if (My_Connections[Idx].lastdata != t)
                        My_Connections[Idx].bps = 0;


@@ -1475,7 +1480,6 @@ Read_Request( CONN_ID Idx )
        }
 
        /* Look at the data in the (read-) buffer of this connection */
        }
 
        /* Look at the data in the (read-) buffer of this connection */

-       My_Connections[Idx].bps += Handle_Buffer(Idx);

        if (Client_Type(c) != CLIENT_SERVER
            && Client_Type(c) != CLIENT_UNKNOWNSERVER
            && Client_Type(c) != CLIENT_SERVICE
        if (Client_Type(c) != CLIENT_SERVER
            && Client_Type(c) != CLIENT_UNKNOWNSERVER
            && Client_Type(c) != CLIENT_SERVICE