thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1498

Browse Source 
Problem:    Error for locked item when using json_decode(). (Shougo)
Solution:   Initialize v_lock.
This commit is contained in:
Bram Moolenaar
2016-03-05 23:23:02 +01:00
parent 0ecbe33718
commit 2588b5a43f
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/json.c
View File

@@ -506,6 +506,7 @@ json_decode_object(js_read_T *reader, typval_T *res, int options)
return FAIL; return FAIL;
} }
di->di_tv = item; di->di_tv = item;
di->di_tv.v_lock = 0;
if (dict_add(res->vval.v_dict, di) == FAIL) if (dict_add(res->vval.v_dict, di) == FAIL)
{ {
dictitem_free(di); dictitem_free(di);

2
src/version.c
View File

@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1498,
/**/ /**/
1497, 1497,
/**/ /**/