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

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

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

Ramsay Jones-2

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

Signed-off-by: Ramsay Jones <[hidden email]>
---
 index-helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index-helper.c b/index-helper.c
index 4a8e2ae..00f286a 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -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);
--
2.8.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

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

David Turner
On Mon, 2016-04-11 at 00:02 +0100, Ramsay Jones wrote:

> see commit eddda371 ("convert strncpy to memcpy", 24-09-2015).
>
> Signed-off-by: Ramsay Jones <[hidden email]>
> ---
>  index-helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/index-helper.c b/index-helper.c
> index 4a8e2ae..00f286a 100644
> --- a/index-helper.c
> +++ b/index-helper.c
> @@ -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);

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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html