thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0309: cannot use an empty key in json

Browse Source 
Problem:    Cannot use an empty key in json.
Solution:   Allow for using an empty key.
This commit is contained in:
Bram Moolenaar
2017-02-05 16:34:43 +01:00
parent 2f9e575583
commit 059b7482a2
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/json.c
View File

@@ -863,7 +863,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options)
&& cur_item != NULL) && cur_item != NULL)
{ {
top_item->jd_key = get_tv_string_buf_chk(cur_item, key_buf); 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); clear_tv(cur_item);
EMSG(_(e_invarg)); EMSG(_(e_invarg));

5
src/testdir/test_json.vim
View File

@@ -144,6 +144,11 @@ func Test_json_decode()
call assert_equal(type(v:none), type(json_decode(''))) call assert_equal(type(v:none), type(json_decode('')))
call assert_equal("", 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_equal({'n': 1}, json_decode('{"n":1,}'))
call assert_fails("call json_decode(\"{'n':'1',}\")", 'E474:') call assert_fails("call json_decode(\"{'n':'1',}\")", 'E474:')
call assert_fails("call json_decode(\"'n'\")", 'E474:') call assert_fails("call json_decode(\"'n'\")", 'E474:')

2
src/version.c
View File

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