diff --git a/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c
index 243584b962..1453ea103c 100644
--- a/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
@@ -170,7 +170,8 @@ ecore_con_local_connect(Ecore_Con_Server *obj,
      }
    else
      {
-        strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path));
+        strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path) - 1);
+        socket_unix.sun_path[sizeof(socket_unix.sun_path) - 1] = '\0';
         socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
      }
 
@@ -330,7 +331,8 @@ start:
    else
      {
         abstract_socket = EINA_FALSE;
-        strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path));
+        strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path) - 1);
+        socket_unix.sun_path[sizeof(socket_unix.sun_path) - 1] = '\0';
         socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
      }