# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1486309504 -3600
# Node ID 287049007bbccf7e1766e1c0df75573b28d7093c
# Parent  f671eaa62df3e1ca7147dd1c30da5c4e4c22c2f5
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.

diff --git a/src/json.c b/src/json.c
--- 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));
diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    309,
+/**/
     308,
 /**/
     307,