From 963c246750e0f77d996fa4d9e1bc7cbe1ef9c49b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 5 Jun 2007 05:42:07 +0000 Subject: [PATCH] Properly null-terminate Unix-domain socket path. Thanks to Marc Espie for spotting this. --- src/unix.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/unix.c b/src/unix.c index cf5bf3b..6aebb25 100644 --- a/src/unix.c +++ b/src/unix.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: unix.c,v 1.18 2007-01-03 08:42:15 adam Exp $ + * $Id: unix.c,v 1.19 2007-06-05 05:42:07 adam Exp $ * UNIX socket COMSTACK. By Morten Bøgeskov. */ /** @@ -185,7 +185,8 @@ static int unix_strtoaddr_ex(const char *str, struct sockaddr_un *add) return 0; TRC(fprintf(stderr, "unix_strtoaddress: %s\n", str ? str : "NULL")); add->sun_family = AF_UNIX; - strncpy(add->sun_path, str, sizeof(add->sun_path)); + strncpy(add->sun_path, str, sizeof(add->sun_path)-1); + add->sun_path[sizeof(add->sun_path)-1] = 0; cp = strchr (add->sun_path, ':'); if (cp) *cp = '\0'; @@ -405,7 +406,8 @@ static int unix_bind(COMSTACK h, void *address, int mode) return -1; } socket_unix.sun_family = AF_UNIX; - strncpy(socket_unix.sun_path, path, sizeof(socket_unix.sun_path)); + strncpy(socket_unix.sun_path, path, sizeof(socket_unix.sun_path)-1); + socket_unix.sun_path[sizeof(socket_unix.sun_path)-1] = 0; if(connect(socket_out, (struct sockaddr *) &socket_unix, SUN_LEN(&socket_unix)) < 0) { if(yaz_errno() == ECONNREFUSED) { TRC (fprintf (stderr, "Socket exists but nobody is listening\n")); -- 1.7.10.4