diff --git a/ChangeLog b/ChangeLog
index 7a853cf0b..1e80030b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-20  Peter Stephenson  <pws@csr.com>
+
+	* Bob Schmertz: 19385: Src/compmatch.c: protect against calling
+	add_match_part with NULL pointers.
+
 2004-01-19  Peter Stephenson  <pws@csr.com>
 
 	* Vincent Stemen <zsh@hightek.org>: users/7011:
diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
index 74b2725eb..b99db2e6e 100644
--- a/Src/Zle/compmatch.c
+++ b/Src/Zle/compmatch.c
@@ -341,7 +341,7 @@ add_match_part(Cmatcher m, char *l, char *w, int wl,
 
     /* If the anchors are equal, we keep only one. */
 
-    if (!strncmp(l, w, wl))
+    if (l && !strncmp(l, w, wl))
 	l = NULL;
 
     /* Split the new part into parts and turn the last one into a