diff --git a/ChangeLog b/ChangeLog
index 65eae1878..5bcdba0aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-01  Werner Lemberg  <wl@gnu.org>
+
+	[bdf] Fix Savannah bug #35658.
+
+	* src/bdf/bdflib.c (_bdf_list_split): Initialize `field' elements
+	properly.
+
 2012-03-01  Werner Lemberg  <wl@gnu.org>
 
 	[psaux] Fix Savannah bug #35657.
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index 879d491e4..fc635c9b4 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -563,6 +563,13 @@
 
     /* Initialize the list. */
     list->used = 0;
+    if ( list->size )
+    {
+      list->field[0] = (char*)empty;
+      list->field[1] = (char*)empty;
+      list->field[2] = (char*)empty;
+      list->field[3] = (char*)empty;
+    }
 
     /* If the line is empty, then simply return. */
     if ( linelen == 0 || line[0] == 0 )