summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-09-29 15:06:14 +0200
committerBram Moolenaar <Bram@vim.org>2015-09-29 15:06:14 +0200
commitc2b717ebd6719e722dcb5f10e4c74033a53ff7c7 (patch)
tree30ce598b55ee66e3941685da2ec78ce369d5e9b3
parent1d478a6242871dcf4566814d3c6208df17991426 (diff)
patch 7.4.887v7.4.887
Problem: Using uninitialized memory for regexp with back reference. (Dominique Pelle) Solution: Initialize end_lnum.
-rw-r--r--src/regexp_nfa.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 609da03715..a21c3c03f8 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -4523,6 +4523,7 @@ skip_add:
sub->list.multi[subidx].start_col =
(colnr_T)(reginput - regline + off);
}
+ sub->list.multi[subidx].end_lnum = -1;
}
else
{
diff --git a/src/version.c b/src/version.c
index 51602989d9..2efbd46165 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 */
/**/
+ 887,
+/**/
886,
/**/
885,