From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 5 Mar 2016 22:23:02 +0000 (+0100)
Subject: patch 7.4.1498
X-Git-Tag: v7.4.1498
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2588b5a43f049ddf542991050260237051caad77;p=vim

patch 7.4.1498
Problem:    Error for locked item when using json_decode(). (Shougo)
Solution:   Initialize v_lock.
---

diff --git a/src/json.c b/src/json.c
index b41d45ee0..34cf188a1 100644
--- a/src/json.c
+++ b/src/json.c
@@ -506,6 +506,7 @@ json_decode_object(js_read_T *reader, typval_T *res, int options)
 		return FAIL;
 	    }
 	    di->di_tv = item;
+	    di->di_tv.v_lock = 0;
 	    if (dict_add(res->vval.v_dict, di) == FAIL)
 	    {
 		dictitem_free(di);
diff --git a/src/version.c b/src/version.c
index 185161538..1bcccd864 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1498,
 /**/
     1497,
 /**/