patch 7.4.1867

Problem:    Memory leak in test_matchstrpos.
Solution:   Free the string before overwriting. (Yegappan Lakshmanan)

diff --git a/src/eval.c b/src/eval.c
index a49d54bd056bd39271286901ddc94d9e011acaee..7b8a0ae9588d7e8515a72a451b5ddd563b9dfd99 100644 (file)
--- 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 f9305d515f39be2c0d1c1ae38743fd134caa31c0..8980b2d3d35db55583fffd7ca612b1588e305785 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1867,
 /**/
     1866,
 /**/