about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Src/hist.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ba9541c94..ad7d21bce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-16  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 27216: Src/hist.c: set chwords to NULL when freed.
+
 2009-08-15  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* users/14307: Src/Zle/zle_tricky.c: end of current command in
@@ -12076,5 +12080,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4759 $
+* $Revision: 1.4760 $
 *****************************************************
diff --git a/Src/hist.c b/Src/hist.c
index 7f52ee08b..86b08bd45 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -1156,6 +1156,7 @@ hend(Eprog prog)
 	zfree(chline, hlinesz);
 	zfree(chwords, chwordlen*sizeof(short));
 	chline = NULL;
+	chwords = NULL;
 	histactive = 0;
 	unqueue_signals();
 	return 1;
@@ -1270,6 +1271,7 @@ hend(Eprog prog)
     zfree(chline, hlinesz);
     zfree(chwords, chwordlen*sizeof(short));
     chline = NULL;
+    chwords = NULL;
     histactive = 0;
     if (isset(SHAREHISTORY)? histfileIsLocked() : isset(INCAPPENDHISTORY))
 	savehistfile(hf, 0, HFILE_USE_OPTIONS | HFILE_FAST);