diff --git a/ChangeLog b/ChangeLog
index af4ccd5ad9..6eb64da366 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-04-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* inet/rcmd.c (__ivaliduser): Check buf for being NULL before
+	free()ing.
+
 1998-04-24 13:56  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/generic/bits/socket.h: Add #defines for enum values.
diff --git a/inet/rcmd.c b/inet/rcmd.c
index a8a6bc451b..d76eff84e9 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -438,7 +438,8 @@ __ivaliduser(hostf, raddr, luser, ruser)
 			return 0;
 		}
 	}
-	free (buf);
+	if (buf != NULL)
+		free (buf);
 	return -1;
 }