* net.cc (cygwin_getpeername): Defend against NULL pointer dereference.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b1f6708efdae7e57d4a95a4b39d6afb921ed9be7..2783c3f7526d97ceb005ce0b8d46560de772cdee 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-02  Christopher Faylor  <cgf@redhat.com>
+
+       * net.cc (cygwin_getpeername): Defend against NULL pointer dereference.
+
 2002-07-02  Egor Duda <deo@logos-m.ru>
 
        * include/cygwin/version.h: Bump API minor version.

diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index c54dc7eed31c5b0b27190c3291ad570ffbce6b41..870bf7865e20213e4ba7a748370a8ac77bc9ddac 100644 (file)
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -1131,7 +1131,7 @@ cygwin_getpeername (int fd, struct sockaddr *name, int *len)
   if (fh)
     res = fh->getpeername (name, len);
 
-  syscall_printf ("%d = getpeername %d", res, fh->get_socket ());
+  syscall_printf ("%d = getpeername %d", res, (fh ? fh->get_socket () : -1));
 
   return res;
 }