Commit Diff

Commit:
9b1c47220fafeacda1e83b4732e1c8574062aac6
From:
Florian Westphal <fw@strlen.de>
Date:
Message:
conn.c: fix NumConnections imbalance New_Server() can call Conn_Close() in its error paths, but that function decrements the number of current active connections. Thus we need to increment it earlier.
Actions:
Patch | Tree
commit - 8e2c5816eec58a5de63399a54773dda6a5729c36
commit + 9b1c47220fafeacda1e83b4732e1c8574062aac6
blob - 4c03877a8f5e843f21211a990e6b61f3a187899c
blob + 77a2bc19d486262bccd5586415f3569b3220f86e
--- src/ngircd/conn.c
+++ src/ngircd/conn.c
@@ -1696,6 +1696,8 @@ New_Server( int Server , ng_ipaddr_t *dest)
 		return;
 	}
 
+	/* Conn_Close() decrements this counter again */
+	NumConnections++;
 	Client_SetIntroducer( c, c );
 	Client_SetToken( c, TOKEN_OUTBOUND );
 
@@ -1725,7 +1727,6 @@ New_Server( int Server , ng_ipaddr_t *dest)
 		return;
 	}
 #endif
-	NumConnections++;
 	LogDebug("Registered new connection %d on socket %d (%ld in total).",
 		 new_sock, My_Connections[new_sock].sock, NumConnections);
 	Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING );