diff --git a/ChangeLog b/ChangeLog
index a95f837e..a8ea9491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-15  YAMAZAKI Makoto <Yamazaki.Makoto@fujixerox.co.jp>
+
+	* src/netrc.c: Fix termination by assertion bug in netrc parsing.
+
 2004-05-09  David Fritz  <zeroxdf@att.net>
 
 	* windows/Makefile.src.bor: Fix broken build rule.  Add clean target.
diff --git a/src/netrc.c b/src/netrc.c
index 5f9588ed..4d97ff19 100644
--- a/src/netrc.c
+++ b/src/netrc.c
@@ -215,9 +215,9 @@ maybe_add_to_list (acc_t **newentry, acc_t **list)
   if (a && ! a->acc)
     {
       /* Free any allocated space.  */
-      xfree (a->host);
-      xfree (a->acc);
-      xfree (a->passwd);
+      xfree_null (a->host);
+      xfree_null (a->acc);
+      xfree_null (a->passwd);
     }
   else
     {