Permalink
Browse files

patch 7.4.2160

Problem:    setmatches() mixes up values. (Nikolai Pavlov)
Solution:   Save the string instead of reusing a shared buffer.
  • Loading branch information...
1 parent 5971dab commit 7dc5e2e486fe0287601968e535902a41a39f65bb @brammool brammool committed Aug 5, 2016
Showing with 16 additions and 2 deletions.
  1. +1 −0 src/dict.c
  2. +4 −2 src/evalfunc.c
  3. +9 −0 src/testdir/test_expr.vim
  4. +2 −0 src/version.c
View
@@ -418,6 +418,7 @@ dict_find(dict_T *d, char_u *key, int len)
/*
* Get a string item from a dictionary.
* When "save" is TRUE allocate memory for it.
+ * When FALSE a shared buffer is used, can only be used once!
* Returns NULL if the entry doesn't exist or out of memory.
*/
char_u *
View
@@ -9659,11 +9659,11 @@ f_setmatches(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
}
}
- group = get_dict_string(d, (char_u *)"group", FALSE);
+ group = get_dict_string(d, (char_u *)"group", TRUE);
priority = (int)get_dict_number(d, (char_u *)"priority");
id = (int)get_dict_number(d, (char_u *)"id");
conceal = dict_find(d, (char_u *)"conceal", -1) != NULL
- ? get_dict_string(d, (char_u *)"conceal", FALSE)
+ ? get_dict_string(d, (char_u *)"conceal", TRUE)
: NULL;
if (i == 0)
{
@@ -9677,6 +9677,8 @@ f_setmatches(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
list_unref(s);
s = NULL;
}
+ vim_free(group);
+ vim_free(conceal);
li = li->li_next;
}
@@ -194,3 +194,12 @@ func Test_funcref()
let OneByRef = funcref('One')
call assert_equal(2, OneByRef())
endfunc
+
+func Test_setmatches()
+ hi def link 1 Comment
+ hi def link 2 PreProc
+ let set = [{"group": 1, "pattern": 2, "id": 3, "priority": 4, "conceal": 5}]
+ let exp = [{"group": '1', "pattern": '2', "id": 3, "priority": 4, "conceal": '5'}]
+ call setmatches(set)
+ call assert_equal(exp, getmatches())
+endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2160,
+/**/
2159,
/**/
2158,

0 comments on commit 7dc5e2e

Please sign in to comment.