--- a/freeDiameter/p_psm.c	Thu Nov 19 17:50:48 2009 +0900
+++ b/freeDiameter/p_psm.c	Thu Nov 19 17:51:23 2009 +0900
@@ -329,7 +329,7 @@
 	/* The following states are impossible */
 	ASSERT( peer->p_hdr.info.runtime.pir_state != STATE_NEW );
 	ASSERT( peer->p_hdr.info.runtime.pir_state != STATE_ZOMBIE );
-	ASSERT( peer->p_hdr.info.runtime.pir_state != STATE_OPEN_HANDSHAKE ); /* because it exists only between two loops */
+	ASSERT( peer->p_hdr.info.runtime.pir_state != STATE_OPEN_HANDSHAKE ); /* because it should exist only between two loops */
 
 	/* Purge invalid events */
 	if (!CHECK_PEVENT(event)) {
@@ -383,6 +383,7 @@
 			{
 				fd_log_debug("Received invalid data from peer '%s', closing the connection\n", peer->p_hdr.info.pi_diamid);
 				CHECK_FCT_DO( fd_event_send(peer->p_events, FDEVP_CNX_ERROR, 0, NULL), goto psm_end );
+				free(ev_data);
 				goto psm_loop;
 			} );
 		
@@ -418,7 +419,7 @@
 					TRACE_DEBUG(FULL, "Accepted a message while not in OPEN state");
 				/* The standard situation : */
 				case STATE_OPEN:
-					/* We received a valid message, update the expiry timer */
+					/* We received a valid routable message, update the expiry timer */
 					CHECK_FCT_DO( fd_p_expi_update(peer), goto psm_end );
 
 					/* Set the message source and add the Route-Record */

--- a/include/freeDiameter/freeDiameter.h	Thu Nov 19 17:50:48 2009 +0900
+++ b/include/freeDiameter/freeDiameter.h	Thu Nov 19 17:51:23 2009 +0900
@@ -247,7 +247,7 @@
 				   We have sent a CER on our initiated connection, and received a CER from the remote peer on another connection. Election.
 				   If we win the election, we must disconnect the initiated connection and send a CEA on the other => we go to OPEN state.
 				   If we lose, we disconnect the other connection (receiver) and fallback to WAITCEA state. */
-	STATE_OPEN_HANDSHAKE,	/* TLS Handshake and validation are in progress in open state -- we show the state because it can last a long time */
+	STATE_OPEN_HANDSHAKE,	/* TLS Handshake and validation are in progress in open state -- we use it only for debug purpose, it is never displayed */
 	
 	/* Failover state machine */
 	STATE_SUSPECT,		/* A DWR was sent and not answered within TwTime. Failover in progress. */