about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/hist.c14
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ea85adeae..b658f0410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-25  Peter Stephenson  <pws@csr.com>
+
+	* 26091: Src/hist.c: crash at end of history line if history
+	not in use.
+
 2008-11-24  Peter Stephenson  <pws@csr.com>
 
 	* Frank Terbeck: users/13482: Doc/Zsh/contrib.yo: fix some prompt
diff --git a/Src/hist.c b/Src/hist.c
index 65812dc91..838c06993 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -1130,12 +1130,14 @@ hend(Eprog prog)
      && (hist_ignore_all_dups = isset(HISTIGNOREALLDUPS)) != 0)
 	histremovedups();
 
-    /*
-     * Added the following in case the test "hptr < chline + 1"
-     * is more than just paranoia.
-     */
-    DPUTS(hptr < chline, "History end pointer off start of line");
-    *hptr = '\0';
+    if (hptr) {
+	/*
+	 * Added the following in case the test "hptr < chline + 1"
+	 * is more than just paranoia.
+	 */
+	DPUTS(hptr < chline, "History end pointer off start of line");
+	*hptr = '\0';
+    }
     addlinknode(hookargs, "zshaddhistory");
     addlinknode(hookargs, chline);
     callhookfunc("zshaddhistory", hookargs, 1, &hookret);