mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-01-19 12:02:52 +00:00
Code Issues Releases Wiki Activity

Conn_Write(): Make sure there is a client when detecting its type

Browse Source 
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!
This commit is contained in:
Alexander Barton 2012-01-06 03:26:24 +01:00
parent cc06e1ff89
commit 05cc9bf9b0
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ngircd/conn.c
View File

@ -936,22 +936,25 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len )
assert( Data != NULL ); assert( Data != NULL );
assert( Len > 0 ); 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() /* Is the socket still open? A previous call to Conn_Write()
* may have closed the connection due to a fatal error. * may have closed the connection due to a fatal error.
* In this case it is sufficient to return an error, as well. */ * 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); LogDebug("Skipped write on closed socket (connection %d).", Idx);
return false; 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 #ifdef ZLIB
if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) { if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
/* Compressed link: /* Compressed link: