From 430e54ddc496b2610ef4ee263f557953cf057db2 Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@users.sourceforge.net>
Date: Sun, 12 Oct 2008 19:28:10 +0000
Subject: 25860: avoid possible NULL dereferencing in bld_parts.

---
 ChangeLog           | 5 +++++
 Src/Zle/compmatch.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e192a90b0..645b278d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-12  Clint Adams  <clint@zsh.org>
+
+	* 25860: Src/Zle/compmatch.c: avoid possible NULL dereferencing in
+	bld_parts.
+
 2008-10-12  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted, c.f. 25848: Test/comptest: attempt to sanitize
diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
index 836dcdd45..f92caa7bf 100644
--- a/Src/Zle/compmatch.c
+++ b/Src/Zle/compmatch.c
@@ -1553,7 +1553,8 @@ bld_parts(char *str, int len, int plen, Cline *lp, Cline *lprem)
 	*lprem = NULL;
     }
 
-    n->next = NULL;
+    if (n)
+        n->next = NULL;
 
     if (lp)
 	*lp = n;
-- 
cgit 1.4.1