aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

patch 8.2.2783: duplicate code for setting byte in blob, blob test may fail

Browse Source 
Problem:    Duplicate code for setting byte in blob, blob test may fail.
Solution:   Call blob_set_append().  Test sort failure with "N".
This commit is contained in:
Bram Moolenaar 2021-04-18 16:08:52 +02:00
parent 39211cba72
commit e8209b91b9
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/eval.c
View File

@ -1321,21 +1321,7 @@ set_var_lval(
{ {
val = (int)tv_get_number_chk(rettv, &error); val = (int)tv_get_number_chk(rettv, &error);
if (!error) if (!error)
{ blob_set_append(lp->ll_blob, lp->ll_n1, val);
garray_T *gap = &lp->ll_blob->bv_ga;
// Allow for appending a byte. Setting a byte beyond
// the end is an error otherwise.
if (lp->ll_n1 < gap->ga_len
|| (lp->ll_n1 == gap->ga_len
&& ga_grow(&lp->ll_blob->bv_ga, 1) == OK))
{
blob_set(lp->ll_blob, lp->ll_n1, val);
if (lp->ll_n1 == gap->ga_len)
++gap->ga_len;
}
// error for invalid range was already given in get_lval()
}
} }
} }
else if (op != NULL && *op != '=') else if (op != NULL && *op != '=')

2
src/testdir/test_blob.vim
View File

@ -630,7 +630,7 @@ func Test_blob_sort()
if has('float') if has('float')
call CheckLegacyAndVim9Failure(['call sort([1.0, 0z11], "f")'], 'E975:') call CheckLegacyAndVim9Failure(['call sort([1.0, 0z11], "f")'], 'E975:')
endif endif
call CheckLegacyAndVim9Failure(['call sort(["abc", 0z11], "f")'], 'E892:') call CheckLegacyAndVim9Failure(['call sort([11, 0z11], "N")'], 'E974:')
endfunc endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -750,6 +750,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 */
/**/
2783,
/**/ /**/
2782, 2782,
/**/ /**/