diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-05 23:23:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-05 23:23:02 +0100 |
| commit | 2588b5a43f049ddf542991050260237051caad77 (patch) | |
| tree | f0a0cfadaec5d1469e369439b1014d10c454bb6e | |
| parent | 0ecbe33718b06a3771fd2c65b331c8c9504657d7 (diff) | |
| download | vim-git-2588b5a43f049ddf542991050260237051caad77.tar.gz | |
patch 7.4.1498v7.4.1498
Problem: Error for locked item when using json_decode(). (Shougo)
Solution: Initialize v_lock.
| -rw-r--r-- | src/json.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
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 @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1498, +/**/ 1497, /**/ 1496, |