commit 2588b5a43f049ddf542991050260237051caad77
author Bram Moolenaar <Bram@vim.org> Sat Mar 05 23:23:02 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Mar 05 23:23:02 2016 +0100
tree f0a0cfadaec5d1469e369439b1014d10c454bb6e
parent 0ecbe33718b06a3771fd2c65b331c8c9504657d7

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

src/json.c

diff --git a/src/json.c b/src/json.c
index b41d45e..34cf188 100644
--- a/src/json.c
+++ b/src/json.c
@@ -506,6 +506,7 @@
 		return FAIL;
 	    }
 	    di->di_tv = item;
+	    di->di_tv.v_lock = 0;
 	    if (dict_add(res->vval.v_dict, di) == FAIL)
 	    {
 		dictitem_free(di);

src/version.c

diff --git a/src/version.c b/src/version.c
index 1851615..1bcccd8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1498,
+/**/
     1497,
 /**/
     1496,