From: Havoc Pennington Date: Tue, 1 Apr 2003 00:43:06 +0000 (+0000) Subject: 2003-03-31 Havoc Pennington X-Git-Tag: dbus-0.7~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dfe82beb530aefce505a9bf915a749647e7183f;p=thirdparty%2Fdbus.git 2003-03-31 Havoc Pennington * dbus/dbus-sysdeps.c (_dbus_connect_unix_socket) (_dbus_listen_unix_socket): fix off-by-one error in null termination spotted by Nalin --- diff --git a/ChangeLog b/ChangeLog index 717ee4880..4e987f41d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-03-31 Havoc Pennington + + * dbus/dbus-sysdeps.c (_dbus_connect_unix_socket) + (_dbus_listen_unix_socket): fix off-by-one error in null + termination spotted by Nalin + 2003-03-31 Havoc Pennington * dbus/dbus-keyring.c (_dbus_keyring_new_homedir): allow setting diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index f551c4bff..cab970a06 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -346,7 +346,7 @@ _dbus_connect_unix_socket (const char *path, _DBUS_ZERO (addr); addr.sun_family = AF_UNIX; strncpy (addr.sun_path, path, _DBUS_MAX_SUN_PATH_LENGTH); - addr.sun_path[_DBUS_MAX_SUN_PATH_LENGTH] = '\0'; + addr.sun_path[_DBUS_MAX_SUN_PATH_LENGTH-1] = '\0'; if (connect (fd, (struct sockaddr*) &addr, sizeof (addr)) < 0) { @@ -405,7 +405,7 @@ _dbus_listen_unix_socket (const char *path, _DBUS_ZERO (addr); addr.sun_family = AF_UNIX; strncpy (addr.sun_path, path, _DBUS_MAX_SUN_PATH_LENGTH); - addr.sun_path[_DBUS_MAX_SUN_PATH_LENGTH] = '\0'; + addr.sun_path[_DBUS_MAX_SUN_PATH_LENGTH-1] = '\0'; if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) {