Mercurial > vim
changeset 24486:5e0db87e5184 v8.2.2783
patch 8.2.2783: duplicate code for setting byte in blob, blob test may fail
Commit: https://github.com/vim/vim/commit/e8209b91b9974da95899b51dba4058b411d04d5b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 18 16:08:52 2021 +0200
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".
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 18 Apr 2021 16:15:04 +0200 |
| parents | 243d48e704cb |
| children | 2bcec3ba6a08 |
| files | src/eval.c src/testdir/test_blob.vim src/version.c |
| diffstat | 3 files changed, 4 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- 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 != '=')
--- 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