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 f8e922f911d30d5e11992188fb0a493e7cfddba1..4dbbc40961426171b41f1289918b68a56aa4649a 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1321,21 +1321,7 @@ set_var_lval(
            {
                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 84d24cb0a3fd3bd2ea81520ea73657938cc79966..5eb3f3cb960ed119a2a26f6632e61ae9b8c33593 100644 (file)
--- a/src/testdir/test_blob.vim
+++ b/src/testdir/test_blob.vim
@@ -630,7 +630,7 @@ func Test_blob_sort()
   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 811370cb15d4a01a1bd8d63cdb4ee3bf955d9204..9a2da2fbc2112e73ddb97409e4a45df6fe1d5ffa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2783,
 /**/
     2782,
 /**/