From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 5 Feb 2017 15:34:43 +0000 (+0100)
Subject: patch 8.0.0309: cannot use an empty key in json
X-Git-Tag: v8.0.0309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=059b7482a2d9d4cebbf4c01b2b2ea6f1e783cc20;p=vim

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.
---

diff --git a/src/json.c b/src/json.c
index fd1b6ec3d..e5e85eb6d 100644
--- a/src/json.c
+++ b/src/json.c
@@ -863,7 +863,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options)
 		    && 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));
diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim
index 661636513..6c3d16ce5 100644
--- 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:')
diff --git a/src/version.c b/src/version.c
index 83e3b5316..dbe0dcb85 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    309,
 /**/
     308,
 /**/