Skip to contentSkip to conversation

index-helper: convert strncpy to memcpy

PATCH In review Ramsay Jones 2 participants 2 messages Jun 16, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 index-helper: convert strncpy to memcpy

see commit eddda371 ("convert strncpy to memcpy", 24-09-2015).

---
 index-helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
index-helper.c +1 -1
index 4a8e2ae..00f286a 100644
@@ -317,7 +317,7 @@ static int setup_socket(const char *socket_path)
 		return -1;
 
 	address.sun_family = AF_UNIX;
-	strncpy(address.sun_path, socket_path, sizeof(address.sun_path));
+	memcpy(address.sun_path, socket_path, len+1); /* include '\0' */
 
 	if (bind(fd, (struct sockaddr *) &address, sizeof(address)))
 		die_errno(_("failed to bind to socket %s"), socket_path);
Signature · 1 line
2.8.0
#1 lore raw
Quoted 22 lines · Ramsay Jones

see commit eddda371 ("convert strncpy to memcpy", 24-09-2015).

---
 index-helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
index-helper.c +1 -1
index 4a8e2ae..00f286a 100644
@@ -317,7 +317,7 @@ static int setup_socket(const char *socket_path)
 		return -1;
 
 	address.sun_family = AF_UNIX;
-	strncpy(address.sun_path, socket_path,
 sizeof(address.sun_path));
+	memcpy(address.sun_path, socket_path, len+1); /* include

'\0' */

index-helper.c +0 -0
 	if (bind(fd, (struct sockaddr *) &address, sizeof(address)))
 		die_errno(_("failed to bind to socket %s"),
Quoted 1 line

socket_path);

Thanks.

I'm actually going to drop this patch because I'm switching to the unix -socket.c helpers, so the affected code no longer exists. But I appreciate the thought anyway.