1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/transport_manager/src/tcp/tcp_client_listener.cc b/src/components/transport_manager/src/tcp/tcp_client_listener.cc
index 82c30744e7..9f2597f0a7 100644
--- a/src/components/transport_manager/src/tcp/tcp_client_listener.cc
+++ b/src/components/transport_manager/src/tcp/tcp_client_listener.cc
@@ -286,9 +286,10 @@ void TcpClientListener::Loop() {
       }
 
       char device_name[32];
-      strncpy(device_name,
-              inet_ntoa(client_address.sin_addr),
-              sizeof(device_name) / sizeof(device_name[0]));
+      size_t size = sizeof(device_name) / sizeof(device_name[0]);
+      strncpy(device_name, inet_ntoa(client_address.sin_addr), size);
+
+      device_name[size - 1] = '\0';
       LOG4CXX_INFO(logger_, "Connected client " << device_name);
       LOG4CXX_INFO(logger_, "Port is: " << port_);