patch 8.2.2783: duplicate code for setting byte in blob, blob test may fail
Problem: Duplicate code for setting byte in blob, blob test may fail.
Solution: Call blob_set_append(). Test sort failure with "N".
diff --git a/src/eval.c b/src/eval.c
index f8e922f..4dbbc40 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1321,21 +1321,7 @@
{
val = (int)tv_get_number_chk(rettv, &error);
if (!error)
- {
- 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()
- }
+ blob_set_append(lp->ll_blob, lp->ll_n1, val);
}
}
else if (op != NULL && *op != '=')
diff --git a/src/testdir/test_blob.vim b/src/testdir/test_blob.vim
index 84d24cb..5eb3f3c 100644
--- a/src/testdir/test_blob.vim
+++ b/src/testdir/test_blob.vim
@@ -630,7 +630,7 @@
if has('float')
call CheckLegacyAndVim9Failure(['call sort([1.0, 0z11], "f")'], 'E975:')
endif
- call CheckLegacyAndVim9Failure(['call sort(["abc", 0z11], "f")'], 'E892:')
+ call CheckLegacyAndVim9Failure(['call sort([11, 0z11], "N")'], 'E974:')
endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 811370c..9a2da2f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2783,
+/**/
2782,
/**/
2781,