Commit Diff

Commit:
05cc9bf9b064c7048f6b197462a686c5a9100798
From:
Alexander Barton <alex@barton.de>
Date:
Message:
Conn_Write(): Make sure there is a client when detecting its type The assert(client != NULL) got triggered during our tests, so there is an error path that resulted in the connection being still established (sock >= 0) but the client structure already freed. So Conn_Write() should handle it!
Actions:
Patch | Tree
commit - cc06e1ff89ae4b7ffc8d95a8ab1d9b6787a5d142
commit + 05cc9bf9b064c7048f6b197462a686c5a9100798
blob - d9d73e842b9ade409ef280c47f1d8e9602046d4b
blob + 5f3c18afd0108fe8eb115c236257cc3c2879bcd7
--- src/ngircd/conn.c
+++ src/ngircd/conn.c
@@ -935,23 +935,26 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len )
 	assert( Idx > NONE );
 	assert( Data != NULL );
 	assert( Len > 0 );
-
-	c = Conn_GetClient(Idx);
-	assert( c != NULL);
-
-	/* Servers do get special write buffer limits, so they can generate
-	 * all the messages that are required while peering. */
-	if (Client_Type(c) == CLIENT_SERVER)
-		writebuf_limit = WRITEBUFFER_SLINK_LEN;
 
 	/* Is the socket still open? A previous call to Conn_Write()
 	 * may have closed the connection due to a fatal error.
 	 * In this case it is sufficient to return an error, as well. */
-	if( My_Connections[Idx].sock <= NONE ) {
+	if (My_Connections[Idx].sock <= NONE) {
 		LogDebug("Skipped write on closed socket (connection %d).", Idx);
 		return false;
 	}
 
+	/* Make sure that there still exists a CLIENT structure associated
+	 * with this connection and check if this is a server or not: */
+	c = Conn_GetClient(Idx);
+	if (c) {
+		/* Servers do get special write buffer limits, so they can
+		 * generate all the messages that are required while peering. */
+		if (Client_Type(c) == CLIENT_SERVER)
+			writebuf_limit = WRITEBUFFER_SLINK_LEN;
+	} else
+		LogDebug("Write on socket without client (connection %d)!?", Idx);
+
 #ifdef ZLIB
 	if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
 		/* Compressed link: