X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Furi%2Fsock_test_server.c;h=29adea2574ae71af98bac344d35a6fd1359c824b;hb=ab7b8d93cf1098970bc17fb4937376bb1ff33a21;hp=f703b177385cc342649979bc6163b1b72280f80f;hpb=8a19f12a0cfe6d611f6e266931af691fb69a74ad;p=vpp.git

diff --git a/src/uri/sock_test_server.c b/src/uri/sock_test_server.c
index f703b177385..29adea2574a 100644
--- a/src/uri/sock_test_server.c
+++ b/src/uri/sock_test_server.c
@@ -514,9 +514,15 @@ main (int argc, char **argv)
 		      continue;
 		    }
 
-		  else if (strlen ((char *) conn->buf))
-		    printf ("\nSERVER (fd %d): RX (%d bytes) - '%s'\n",
-			    conn->fd, rx_bytes, conn->buf);
+		  else if (((char *) conn->buf)[0] != 0)
+		    {
+		      // If it looks vaguely like a string, make sure it's terminated
+		      ((char *) conn->buf)[rx_bytes <
+					   conn->buf_size ? rx_bytes :
+					   conn->buf_size - 1] = 0;
+		      printf ("\nSERVER (fd %d): RX (%d bytes) - '%s'\n",
+			      conn->fd, rx_bytes, conn->buf);
+		    }
 		}
 	      else		// rx_bytes < 0
 		{