summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_vi.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5aeacd26b..d89214af7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-13 Peter Stephenson <p.stephenson@samsung.com>
+
+ * Jun T: 32480: Src/Zle/zle_vi.c: fix crash in vi mode when too
+ few previous changes.
+
2014-03-09 Barton E. Schaefer <schaefer@zsh.org>
* 32468: Src/Modules/zutil.c: save/restore match/mbegin/mend
diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c
index 994b44fe3..9e39143d0 100644
--- a/Src/Zle/zle_vi.c
+++ b/Src/Zle/zle_vi.c
@@ -401,7 +401,7 @@ vichange(UNUSED(char **args))
forekill(c2 - zlecs, CUT_RAW);
selectkeymap("main", 1);
viinsbegin = zlecs;
- vistartchange = curchange->prev->changeno;
+ vistartchange = (curchange && curchange->prev) ? curchange->prev->changeno : 0;
}
return ret;
}