diff -ru hurd.orig/ftpfs/ChangeLog hurd/ftpfs/ChangeLog
--- hurd.orig/ftpfs/ChangeLog	Wed Apr 25 13:36:48 2001
+++ hurd/ftpfs/ChangeLog	Tue Jul 31 01:21:35 2001
@@ -1,3 +1,8 @@
+2001-07-31  Igor Khavkine  <i_khavki@alcor.concordia.ca>
+
+	* dir.c: Added checks for validity of malloc'ed memory.
+	* node.c: Same as above.
+
 2001-02-12  Marcus Brinkmann  <marcus@gnu.org>
 
 	* ftpfs.c: Include <version.h>.  Add global variable
diff -ru hurd.orig/hostmux/ChangeLog hurd/hostmux/ChangeLog
--- hurd.orig/hostmux/ChangeLog	Wed Apr 25 13:36:48 2001
+++ hurd/hostmux/ChangeLog	Tue Jul 31 01:26:34 2001
@@ -1,3 +1,7 @@
+2001-07-31  Igor Khavkine <i_khavki@alcor.concordia.ca>
+
+	* mux.c: Added checks for validity of malloc'ed memory.
+
 2001-02-12  Marcus Brinkmann  <marcus@gnu.org>
 
 	* hostmux.c: Include <version.h>.  Add global variable
diff -ru hurd.orig/ftpfs/dir.c hurd/ftpfs/dir.c
--- hurd.orig/ftpfs/dir.c	Wed Apr 25 13:36:48 2001
+++ hurd/ftpfs/dir.c	Tue Jul 31 01:11:40 2001
@@ -121,6 +121,10 @@
 	{
 	  e->hv = hv;
 	  e->name = strdup (name);
+	  if (!e->name) {
+	    free (e);
+	    return NULL;
+	  }
 	  e->node = 0;
 	  e->dir = dir;
 	  e->stat_timestamp = 0;
diff -ru hurd.orig/ftpfs/node.c hurd/ftpfs/node.c
--- hurd.orig/ftpfs/node.c	Wed Aug  6 18:08:35 1997
+++ hurd/ftpfs/node.c	Tue Jul 31 01:18:31 2001
@@ -51,8 +51,10 @@
   nn->ncache_next = nn->ncache_prev = 0;
 
   new = netfs_make_node (nn);
-  if (! new)
+  if (!new || !nn->rmt_path)
     {
+      if (nn->rmt_path)
+	free (nn->rmt_path);
       free (nn);
       return ENOMEM;
     }
diff -ru hurd.orig/hostmux/mux.c hurd/hostmux/mux.c
--- hurd.orig/hostmux/mux.c	Sun Jul 11 15:40:34 1999
+++ hurd/hostmux/mux.c	Tue Jul 31 01:25:28 2001
@@ -287,6 +287,10 @@
     nm->canon = nm->name;
   else
     nm->canon = strdup (he->h_name);
+  if (!nm->name || !nm->cannon) {
+    free_name (nm);
+    return ENOMEM;
+  }
 
   err = create_host_node (mux, nm, node);
   if (err)