summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-04-15 22:22:57 +0200
committerBram Moolenaar <Bram@vim.org>2013-04-15 22:22:57 +0200
commitb70a473e24e36fd14361ece54da37e3ca7155fdd (patch)
tree92704fa8f870a8580bee901edcdaa3013feed7bd
parent3bb28557e192b9433dc286f89300f2557b46e821 (diff)
downloadvim-git-b70a473e24e36fd14361ece54da37e3ca7155fdd.tar.gz
updated for version 7.3.905v7.3.905
Problem: Crash when writing viminfo. (Ron Aaron) Solution: Prevent freed history info to be used.
-rw-r--r--src/ex_getln.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index a7a1409b0..740cca204 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6264,6 +6264,7 @@ write_viminfo_history(fp)
vim_free(viminfo_history[type][i]);
vim_free(viminfo_history[type]);
viminfo_history[type] = NULL;
+ viminfo_hisidx[type] = 0;
}
}
#endif /* FEAT_VIMINFO */
diff --git a/src/version.c b/src/version.c
index 0e84a049e..c745b1c4a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 905,
+/**/
904,
/**/
903,