patch 7.4.1498

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

Author: brammool

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);

src/version.c

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