summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-07-28 13:33:45 +0200
committerBram Moolenaar <Bram@vim.org>2015-07-28 13:33:45 +0200
commit6b9be1b6f29884536d99f7347fb9faa08e642e61 (patch)
tree3eaf2d29ef5a343caebc82c9530fe76d1d040fb0
parent31b259bf9571cae6408be3ef75d9485e24029be5 (diff)
downloadvim-6b9be1b6f29884536d99f7347fb9faa08e642e61.zip
patch 7.4.799
Problem: Accessing memory before an allocated block. Solution: Check for not going before the start of a pattern. (Dominique Pelle)
-rw-r--r--src/fileio.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 17b73bf65..b1bcfb536 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -8514,7 +8514,7 @@ do_autocmd_event(event, pat, nested, cmd, forceit, group)
*/
brace_level = 0;
for (endpat = pat; *endpat && (*endpat != ',' || brace_level
- || endpat[-1] == '\\'); ++endpat)
+ || (endpat > pat && endpat[-1] == '\\')); ++endpat)
{
if (*endpat == '{')
brace_level++;
diff --git a/src/version.c b/src/version.c
index c06287242..718ea3111 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 799,
+/**/
798,
/**/
797,