summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/zle_tricky.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d941d9793..54f72723c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-12  Clint Adams  <clint@zsh.org>
 
+	* 25859: Src/Zle/zle_tricky.c: avoid possible NULL dereferencing if
+	RC_QUOTES is set.
+
 	* Mikael Magnusson: 25856: Etc/completion-style-guide: typo fixes.
 
 	* Mikael Magnusson: 25855: Etc/zsh-development-guide: typo fixes.
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index bc0152401..dbb01f483 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -1235,7 +1235,7 @@ get_comp_string(void)
 	    /* This is done when the lexer reached the word the cursor is on. */
 	    tt = tokstr ? dupstring(tokstr) : NULL;
 
-            if (isset(RCQUOTES)) {
+            if (isset(RCQUOTES) && tt) {
 		char *tt1, *e = tt + zlemetacs - wb;
 		for (tt1 = tt; *tt1; tt1++) {
 		    if (*tt1 == Snull) {