Mercurial > vim

changeset 9287:af25a1a875db v7.4.1926

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/a890f5e34887bff7616bdb4b9ee0bf98c8d2a8f0 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 12 23:03:19 2016 +0200 patch 7.4.1926 Problem: Possible crash with many history items. Solution: Avoid the index going past the last item.
author Christian Brabandt <cb@256bit.org>
date Sun, 12 Jun 2016 23:15:07 +0200
parents 64035abb986b
children d5c81e42517c
files src/ex_getln.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6448,7 +6448,7 @@ merge_history(int type)
 	else
 	    clear_hist_entry(&new_hist[i]);
     }
-    hisidx[type] = len - 1;
+    hisidx[type] = (i < len ? i : len) - 1;
 
     /* Free what is not kept. */
     for (i = 0; i < viminfo_hisidx[type]; i++)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1926,
+/**/
     1925,
 /**/
     1924,