Mercurial > vim
diff src/textprop.c @ 16772:18093a6accb5 v8.1.1388
patch 8.1.1388: errors when calling prop_remove() for an unloaded buffer
commit https://github.com/vim/vim/commit/f0884c5f3f5a25481d1e16f0979aa978a6690bb1
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 24 21:22:29 2019 +0200
patch 8.1.1388: errors when calling prop_remove() for an unloaded buffer
Problem: Errors when calling prop_remove() for an unloaded buffer.
Solution: Bail out when the buffer is not loaded. Add a few more tests for
failing when the buffer number is invalid.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 24 May 2019 21:30:05 +0200 |
| parents | 09c81f17f83c |
| children | fc58fee685e2 |
line wrap: on
line diff
--- a/src/textprop.c +++ b/src/textprop.c @@ -129,7 +129,7 @@ get_bufnr_from_arg(typval_T *arg, buf_T di = dict_find(arg->vval.v_dict, (char_u *)"bufnr", -1); if (di != NULL) { - *buf = tv_get_buf(&di->di_tv, FALSE); + *buf = get_buf_arg(&di->di_tv); if (*buf == NULL) return FAIL; } @@ -560,13 +560,10 @@ f_prop_remove(typval_T *argvars, typval_ } dict = argvars[0].vval.v_dict; - di = dict_find(dict, (char_u *)"bufnr", -1); - if (di != NULL) - { - buf = tv_get_buf(&di->di_tv, FALSE); - if (buf == NULL) - return; - } + if (get_bufnr_from_arg(&argvars[0], &buf) == FAIL) + return; + if (buf->b_ml.ml_mfp == NULL) + return; di = dict_find(dict, (char_u*)"all", -1); if (di != NULL) @@ -628,7 +625,7 @@ f_prop_remove(typval_T *argvars, typval_ buf->b_ml.ml_flags |= ML_LINE_DIRTY; cur_prop = buf->b_ml.ml_line_ptr + len - + idx * sizeof(textprop_T); + + idx * sizeof(textprop_T); } taillen = buf->b_ml.ml_line_len - len