X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Funix%2Fcli.c;fp=src%2Fvlib%2Funix%2Fcli.c;h=03baf3e58c12043dcd0f0ec08652c59e63723c72;hb=49ebbf7048f4d5c0f0eae02e7a1810f66ab61f58;hp=e6f549b776f708a43839284b4047c143ff2b042f;hpb=2973350c81a7592b9ff66547b8cd34e5e6c8ccf0;p=vpp.git

diff --git a/src/vlib/unix/cli.c b/src/vlib/unix/cli.c
index e6f549b776f..03baf3e58c1 100644
--- a/src/vlib/unix/cli.c
+++ b/src/vlib/unix/cli.c
@@ -1312,6 +1312,10 @@ unix_cli_new_session_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
 	    /* Add an identifier to the new session list */
 	    unix_cli_new_session_t ns;
 
+	    /* Check the connection didn't close already */
+	    if (pool_is_free_index (cm->cli_file_pool, event_data[0]))
+	      break;
+
 	    ns.cf_index = event_data[0];
 	    ns.deadline = vlib_time_now (vm) + 1.0;
 
@@ -2693,7 +2697,7 @@ unix_cli_kill (unix_cli_main_t * cm, uword cli_file_index)
 
       if (ns->cf_index == cli_file_index)
 	{
-	  vec_del1 (cm->new_sessions, i);
+	  ns->cf_index = ~0;
 	  break;
 	}
     }