diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2020-11-25 17:27:39 +0000 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2021-09-15 21:54:00 +0100 |
| commit | c1b8731ece81cdbc43fbb6050eaf12e84abdc4b0 (patch) | |
| tree | ff537217a607c7acf930b6913d531750dcafbb51 | |
| parent | d346ac536fbb7716e6a0d0f5ca7af9c39ec95de0 (diff) | |
| download | rneovim-c1b8731ece81cdbc43fbb6050eaf12e84abdc4b0.tar.gz rneovim-c1b8731ece81cdbc43fbb6050eaf12e84abdc4b0.tar.bz2 rneovim-c1b8731ece81cdbc43fbb6050eaf12e84abdc4b0.zip | |
vim-patch:8.1.0755: error message for get() on a Blob with invalid index
Problem: Error message for get() on a Blob with invalid index.
Solution: Return an empty Blob, like get() on a List does.
https://github.com/vim/vim/commit/2ea773b468a1143214c2f12b91ab5e1e7abb4a14
| -rw-r--r-- | src/nvim/eval/funcs.c | 10 | ||||
| -rw-r--r-- | src/nvim/testdir/test_blob.vim | 13 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 3c25d76866..e804029187 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -2809,14 +2809,18 @@ static void f_get(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (argvars[0].v_type == VAR_BLOB) { bool error = false; - const int idx = tv_get_number_chk(&argvars[1], &error); + int idx = tv_get_number_chk(&argvars[1], &error); if (!error) { rettv->v_type = VAR_NUMBER; - if (idx >= tv_blob_len(argvars[0].vval.v_blob)) { - EMSGN(_(e_blobidx), idx); + if (idx < 0) { + idx = tv_blob_len(argvars[0].vval.v_blob) + idx; + } + if (idx < 0 || idx >= tv_blob_len(argvars[0].vval.v_blob)) { + rettv->vval.v_number = -1; } else { rettv->vval.v_number = tv_blob_get(argvars[0].vval.v_blob, idx); + tv = rettv; } } } else if (argvars[0].v_type == VAR_LIST) { diff --git a/src/nvim/testdir/test_blob.vim b/src/nvim/testdir/test_blob.vim index 87448e4fba..5bee25a0a2 100644 --- a/src/nvim/testdir/test_blob.vim +++ b/src/nvim/testdir/test_blob.vim @@ -20,7 +20,6 @@ func Test_blob_create() call assert_equal(0xDE, get(b, 0)) call assert_equal(0xEF, get(b, 3)) - call assert_fails('let x = get(b, 4)') call assert_fails('let b = 0z1', 'E973:') call assert_fails('let b = 0z1x', 'E973:') @@ -79,6 +78,18 @@ func Test_blob_get_range() call assert_equal(0z, b[5:6]) endfunc +func Test_blob_get() + let b = 0z0011223344 + call assert_equal(0x00, get(b, 0)) + call assert_equal(0x22, get(b, 2, 999)) + call assert_equal(0x44, get(b, 4)) + call assert_equal(0x44, get(b, -1)) + call assert_equal(-1, get(b, 5)) + call assert_equal(999, get(b, 5, 999)) + call assert_equal(-1, get(b, -8)) + call assert_equal(999, get(b, -8, 999)) +endfunc + func Test_blob_to_string() let b = 0zDEADBEEF call assert_equal('[0xDE,0xAD,0xBE,0xEF]', string(b)) |