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
commitac7bf62c8209e8fd62d6143f1f8a5dcc37923985 (patch)
tree91007d14a8d0a72ef6924d8daa54fd5cca5c3a27
parent290db47e45cf28e1b82c485033242101d70e295a (diff)
downloadvim-ac7bf62c8209e8fd62d6143f1f8a5dcc37923985.tar.gz
updated for version 7.3.905v7.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 a7a1409b..740cca20 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 0e84a049..c745b1c4 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,