Mercurial > vim
changeset 10839:287049007bbc v8.0.0309
patch 8.0.0309: cannot use an empty key in json
commit https://github.com/vim/vim/commit/059b7482a2d9d4cebbf4c01b2b2ea6f1e783cc20
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 5 16:34:43 2017 +0100
patch 8.0.0309: cannot use an empty key in json
Problem: Cannot use an empty key in json.
Solution: Allow for using an empty key.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 05 Feb 2017 16:45:04 +0100 |
| parents | f671eaa62df3 |
| children | 2cb1b68ef02e |
| files | src/json.c src/testdir/test_json.vim src/version.c |
| diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/json.c +++ b/src/json.c @@ -863,7 +863,7 @@ json_decode_item(js_read_T *reader, typv && cur_item != NULL) { top_item->jd_key = get_tv_string_buf_chk(cur_item, key_buf); - if (top_item->jd_key == NULL || *top_item->jd_key == NUL) + if (top_item->jd_key == NULL) { clear_tv(cur_item); EMSG(_(e_invarg));
--- a/src/testdir/test_json.vim +++ b/src/testdir/test_json.vim @@ -144,6 +144,11 @@ func Test_json_decode() call assert_equal(type(v:none), type(json_decode(''))) call assert_equal("", json_decode('""')) + " empty key is OK + call assert_equal({'': 'ok'}, json_decode('{"": "ok"}')) + " but not twice + call assert_fails("call json_decode('{\"\": \"ok\", \"\": \"bad\"}')", 'E938:') + call assert_equal({'n': 1}, json_decode('{"n":1,}')) call assert_fails("call json_decode(\"{'n':'1',}\")", 'E474:') call assert_fails("call json_decode(\"'n'\")", 'E474:')