diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index 8e398744cd7..12735cb90f4 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-23  Frank Ch. Eigler  <fche@elastic.org>
+
+	PR 23084.
+	* mf-hooks2.c (accept): Tolerate NULL sockaddr* parameter.
+
 2005-09-23  Frank Ch. Eigler  <fche@elastic.org>
 
 	* testsuite/libmudflap.c++/pass58-frag.cxx: New test for heisenbug 19319.
diff --git a/libmudflap/mf-hooks2.c b/libmudflap/mf-hooks2.c
index 0ffcf09ac1f..1da2261ae8c 100644
--- a/libmudflap/mf-hooks2.c
+++ b/libmudflap/mf-hooks2.c
@@ -1400,7 +1400,8 @@ WRAPPER2(int, getsockopt, int s, int level, int optname, void *optval,
 WRAPPER2(int, accept, int s, struct  sockaddr *addr, socklen_t *addrlen)
 {
   TRACE ("%s\n", __PRETTY_FUNCTION__);
-  MF_VALIDATE_EXTENT (addr, (size_t)*addrlen, __MF_CHECK_WRITE, "accept addr");
+  if (addr != NULL)
+    MF_VALIDATE_EXTENT (addr, (size_t)*addrlen, __MF_CHECK_WRITE, "accept addr");
   return accept (s, addr, addrlen);
 }