diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2019-06-04 21:45:04 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2019-06-04 22:19:31 +0200 |
| commit | 66011b4bee4a70e1c6e5673b7971c31a04768c3f (patch) | |
| tree | d946f038caf629462bfbfdda1e2a4d451d2245b8 /src | |
| parent | 917b2ddf69459ed3d7d81c31e765f80939945041 (diff) | |
| download | weechat-66011b4bee4a70e1c6e5673b7971c31a04768c3f.zip | |
relay: fix truncated path when the unix socket path is longer than the authorized one (issue #733)
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/relay/relay-server.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/relay/relay-server.c b/src/plugins/relay/relay-server.c index 86b1a48df..c15fbff06 100644 --- a/src/plugins/relay/relay-server.c +++ b/src/plugins/relay/relay-server.c @@ -265,7 +265,6 @@ relay_server_sock_cb (const void *pointer, void *data, int fd) struct sockaddr_in client_addr; struct sockaddr_in6 client_addr6; struct sockaddr_un client_addr_unix; - socklen_t client_addr_size; void *ptr_addr; int client_fd, flags, set, max_clients, num_clients_on_port; @@ -418,8 +417,9 @@ relay_server_sock_cb (const void *pointer, void *data, int fd) } else { - strncpy (unix_address, client_addr_unix.sun_path, - sizeof (unix_address)); + snprintf (unix_address, sizeof (unix_address), + "%s", + client_addr_unix.sun_path); ptr_ip_address = unix_address; } @@ -544,8 +544,10 @@ relay_server_create_socket (struct t_relay_server *server) domain = AF_UNIX; memset (&server_addr_unix, 0, sizeof (struct sockaddr_un)); server_addr_unix.sun_family = domain; - strncpy (server_addr_unix.sun_path, server->path, - sizeof (server_addr_unix.sun_path)); + snprintf (server_addr_unix.sun_path, + sizeof (server_addr_unix.sun_path), + "%s", + server->path); ptr_addr = &server_addr_unix; addr_size = sizeof (struct sockaddr_un); if (!relay_config_check_path_length (server->path)) |