aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00
Code Activity

patch 8.2.0120: virtcol() does not check arguments to be valid

Browse Source 
Problem:    virtcol() does not check arguments to be valid, which may lead to
            a crash.
Solution:   Check the column to be valid.  Do not decrement MAXCOL.
            (closes #5480)
This commit is contained in:
Bram Moolenaar
2020-01-15 20:36:55 +01:00
parent 1470dc35c4
commit b3d33d8570
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/evalfunc.c
View File

@@ -6605,7 +6605,7 @@ f_setpos(typval_T *argvars, typval_T *rettv)
{
if (list2fpos(&argvars[1], &pos, &fnum, &curswant) == OK)
{
if (--pos.col < 0)
if (pos.col != MAXCOL && --pos.col < 0)
pos.col = 0;
if (name[0] == '.' && name[1] == NUL)
{
@@ -8372,11 +8372,21 @@ f_virtcol(typval_T *argvars, typval_T *rettv)
colnr_T vcol = 0;
pos_T *fp;
int fnum = curbuf->b_fnum;
int len;
fp = var2fpos(&argvars[0], FALSE, &fnum);
if (fp != NULL && fp->lnum <= curbuf->b_ml.ml_line_count
&& fnum == curbuf->b_fnum)
{
// Limit the column to a valid value, getvvcol() doesn't check.
if (fp->col < 0)
fp->col = 0;
else
{
len = (int)STRLEN(ml_get(fp->lnum));
if (fp->col > len)
fp->col = len;
}
getvvcol(curwin, fp, NULL, NULL, &vcol);
++vcol;
}