summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <schaefer@zsh.org>2013-04-20 08:40:18 -0700
committerBart Schaefer <schaefer@zsh.org>2013-04-20 08:40:18 -0700
commitfa7c51971d93d407f50757fbe2f81c91c227878d (patch)
treeb841b65d16f1372a6b3fa80c287d7f485c62c58e
parent452aa5157a26959ed6d127d287d703e804b5e2c1 (diff)
downloadzsh-fa7c51971d93d407f50757fbe2f81c91c227878d.tar.gz
zsh-fa7c51971d93d407f50757fbe2f81c91c227878d.tar.xz
zsh-fa7c51971d93d407f50757fbe2f81c91c227878d.zip
31272: Avoid double free, get_compctl should not free its arguments.
-rw-r--r--ChangeLog4
-rw-r--r--Src/Zle/compctl.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6abf6db9a..d5ced53d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* 31281: Completion/Unix/Command/_du: _du: add support for Mac OS
 	X
 
+2013-04-20  Bart Schaefer  <schaefer@zsh.org>
+
+	* 31272: Src/Zle/compctl.c: avoid double free.
+
 2013-04-16  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* Daniel Friesel: 31265: Completion/Unix/Command/_devtodo:
diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c
index 0143370c7..ab1857c0a 100644
--- a/Src/Zle/compctl.c
+++ b/Src/Zle/compctl.c
@@ -398,7 +398,6 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl)
 	if (cl)
 	    return 1;
 	else {
-	    freecompctl(cc);
 	    cclist = COMP_REMOVE;
 	    return 0;
 	}