thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1388: errors when calling prop_remove() for an unloaded buffer

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2019-05-24 21:22:29 +02:00
parent d79eef2eb1
commit f0884c5f3f
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/textprop.c
View File

@@ -129,7 +129,7 @@ get_bufnr_from_arg(typval_T *arg, buf_T **buf)
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_T *rettv)
}
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_T *rettv)
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