aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00
Code Activity

patch 8.1.0755: error message for get() on a Blob with invalid index

Browse Source 
Problem:    Error message for get() on a Blob with invalid index.
Solution:   Return an empty Blob, like get() on a List does.
This commit is contained in:
Bram Moolenaar
2019-01-15 22:16:42 +01:00
parent 177ab9e026
commit 2ea773b468
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/evalfunc.c
View File

@@ -4408,10 +4408,15 @@ f_get(typval_T *argvars, typval_T *rettv)
if (!error) if (!error)
{ {
rettv->v_type = VAR_NUMBER; rettv->v_type = VAR_NUMBER;
if (idx >= blob_len(argvars[0].vval.v_blob)) if (idx < 0)
semsg(_(e_blobidx), idx); idx = blob_len(argvars[0].vval.v_blob) + idx;
if (idx < 0 || idx >= blob_len(argvars[0].vval.v_blob))
rettv->vval.v_number = -1;
else else
{
rettv->vval.v_number = blob_get(argvars[0].vval.v_blob, idx); rettv->vval.v_number = blob_get(argvars[0].vval.v_blob, idx);
tv = rettv;
}
} }
} }
else if (argvars[0].v_type == VAR_LIST) else if (argvars[0].v_type == VAR_LIST)

13
src/testdir/test_blob.vim
View File

@@ -20,7 +20,6 @@ func Test_blob_create()
call assert_equal(0xDE, get(b, 0)) call assert_equal(0xDE, get(b, 0))
call assert_equal(0xEF, get(b, 3)) 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 = 0z1', 'E973:')
call assert_fails('let b = 0z1x', 'E973:') call assert_fails('let b = 0z1x', 'E973:')
@@ -79,6 +78,18 @@ func Test_blob_get_range()
call assert_equal(0z, b[5:6]) call assert_equal(0z, b[5:6])
endfunc 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() func Test_blob_to_string()
let b = 0zDEADBEEF let b = 0zDEADBEEF
call assert_equal('[0xDE,0xAD,0xBE,0xEF]', string(b)) call assert_equal('[0xDE,0xAD,0xBE,0xEF]', string(b))

2
src/version.c
View File

@@ -795,6 +795,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 */
/**/
755,
/**/ /**/
754, 754,
/**/ /**/