summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-01 22:34:48 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-01 22:34:48 +0200
commit3c809343c72d9964475f421fd03bb892bc584a51 (patch)
tree51e3d8454c35b27494dad3da409d0d0045b87db0
parenta96732150cda2f242133228579b05437a39b8daa (diff)
patch 7.4.1867v7.4.1867
Problem: Memory leak in test_matchstrpos. Solution: Free the string before overwriting. (Yegappan Lakshmanan)
-rw-r--r--src/eval.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index a49d54bd05..7b8a0ae958 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -15773,6 +15773,7 @@ find_some_match(typval_T *argvars, typval_T *rettv, int type)
listitem_T *li3 = li2->li_next;
listitem_T *li4 = li3->li_next;
+ vim_free(li1->li_tv.vval.v_string);
li1->li_tv.vval.v_string = vim_strnsave(regmatch.startp[0],
(int)(regmatch.endp[0] - regmatch.startp[0]));
li3->li_tv.vval.v_number =
diff --git a/src/version.c b/src/version.c
index f9305d515f..8980b2d3d3 100644
--- 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 */
/**/
+ 1867,
+/**/
1866,
/**/
1865,