IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

eval: Treat [] and [""] as any other empty string

Browse Source
This commit is contained in:
ZyX 2016-03-20 20:03:12 +03:00
parent af7ff808c7
commit 9af400f979
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/eval.c
View File

@ -11608,15 +11608,18 @@ static void f_json_decode(typval_T *argvars, typval_T *rettv)
return; return;
} }
tofree = s; tofree = s;
if (s == NULL) {
assert(len == 0);
s = "";
}
} else { } else {
s = (char *) get_tv_string_buf_chk(&argvars[0], (char_u *) numbuf); s = (char *) get_tv_string_buf_chk(&argvars[0], (char_u *) numbuf);
if (s) { if (s) {
len = strlen(s); len = strlen(s);
} else {
return;
} }
} }
if (s == NULL) {
return;
}
if (json_decode_string(s, len, rettv) == FAIL) { if (json_decode_string(s, len, rettv) == FAIL) {
emsgf(_("E474: Failed to parse %.*s"), (int) len, s); emsgf(_("E474: Failed to parse %.*s"), (int) len, s);
rettv->v_type = VAR_NUMBER; rettv->v_type = VAR_NUMBER;

4
test/functional/eval/json_functions_spec.lua
View File

@ -507,6 +507,10 @@ describe('json_decode() function', function()
it('fails to parse empty string', function() it('fails to parse empty string', function()
eq('Vim(call):E474: Attempt to decode a blank string', eq('Vim(call):E474: Attempt to decode a blank string',
exc_exec('call json_decode("")')) exc_exec('call json_decode("")'))
eq('Vim(call):E474: Attempt to decode a blank string',
exc_exec('call json_decode([])'))
eq('Vim(call):E474: Attempt to decode a blank string',
exc_exec('call json_decode([""])'))
eq('Vim(call):E474: Attempt to decode a blank string', eq('Vim(call):E474: Attempt to decode a blank string',
exc_exec('call json_decode(" ")')) exc_exec('call json_decode(" ")'))
eq('Vim(call):E474: Attempt to decode a blank string', eq('Vim(call):E474: Attempt to decode a blank string',