From 1f64102fa6f67ca0893cc78ee21cfabc20348a72 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 7 Feb 2002 15:04:32 +0000 Subject: [PATCH] * net.cc (cygwin_getsockname): Fix handling of NULL sun_path. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/net.cc | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d555fb0a0..84daf61e3 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2002-02-07 Corinna Vinschen + + * net.cc (cygwin_getsockname): Fix handling of NULL sun_path. + 2002-01-29 Corinna Vinschen * net.cc (getdomainname): Fix registry key for 9x systems, too. diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index ac6fdc95e..a564f44fb 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -1375,12 +1375,17 @@ cygwin_getsockname (int fd, struct sockaddr *addr, int *namelen) struct sockaddr_un *sun = (struct sockaddr_un *) addr; memset (sun, 0, *namelen); sun->sun_family = AF_LOCAL; - /* According to SUSv2 "If the actual length of the address is greater - than the length of the supplied sockaddr structure, the stored - address will be truncated." We play it save here so that the - path always has a trailing 0 even if it's truncated. */ - strncpy (sun->sun_path, sock->get_sun_path (), - *namelen - sizeof *sun + sizeof sun->sun_path - 1); + + if (!sock->get_sun_path ()) + sun->sun_path[0] = '\0'; + else + /* According to SUSv2 "If the actual length of the address is + greater than the length of the supplied sockaddr structure, the + stored address will be truncated." We play it save here so + that the path always has a trailing 0 even if it's truncated. */ + strncpy (sun->sun_path, sock->get_sun_path (), + *namelen - sizeof *sun + sizeof sun->sun_path - 1); + *namelen = sizeof *sun - sizeof sun->sun_path + strlen (sun->sun_path) + 1; res = 0;