2 files changed, 11 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 5fc7ec9c..2efc718e 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,13 @@ change.  MA = Matthias Andree, ESR = Eric S. Raymond, RF = Rob Funk.)
 
 --------------------------------------------------------------------------------
 
+fetchmail 6.3.3 (not yet released):
+
+# BUG FIXES:
+* Do not attempt to overwrite the netrc password if none has been specified.
+  This fixes a segmentation fault. BerliOS bug #6234. BerliOS patch #804 by
+  Craig Leres.
+
 fetchmail 6.3.2 (released 2006-01-22):
 
 Unless otherwise noted, changes to this release were made by Matthias Andree.
diff --git a/netrc.c b/netrc.c
index 6c68d2c0..ea422edf 100644
--- a/netrc.c
+++ b/netrc.c
@@ -314,8 +314,10 @@ void
 free_netrc(netrc_entry *a) {
     while(a) {
 	netrc_entry *n = a->next;
-	memset(a->password, 0x55, strlen(a->password));
-	xfree(a->password);
+	if (a->password != NULL) {
+		memset(a->password, 0x55, strlen(a->password));
+		free(a->password);
+	}
 	xfree(a->login);
 	xfree(a->host);
 	xfree(a);