kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0127: Naming a non-pointer variable "oap" is strange

Browse Source 
Problem:  Naming a non-pointer variable "oap" is strange.
Solution: Rename it to "oa". Also prevent using freed memory in case of
          memory allocation failure. (zeertzjq)

closes: vim/vim#14075

5e3674b42d
This commit is contained in:
zeertzjq 2024-02-23 06:37:19 +08:00
parent 06df895e71
commit 1f75184b5c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/eval/funcs.c
View File

@ -2874,7 +2874,7 @@ static void f_getregion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
p2 = p;
}
oparg_T oap;
oparg_T oa;
bool inclusive = true;
if (region_type == kMTCharWise) {
@ -2902,16 +2902,16 @@ static void f_getregion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
colnr_T sc1, ec1, sc2, ec2;
getvvcol(curwin, &p1, &sc1, NULL, &ec1);
getvvcol(curwin, &p2, &sc2, NULL, &ec2);
oap.motion_type = kMTBlockWise;
oap.inclusive = true;
oap.op_type = OP_NOP;
oap.start = p1;
oap.end = p2;
oap.start_vcol = MIN(sc1, sc2);
oa.motion_type = kMTBlockWise;
oa.inclusive = true;
oa.op_type = OP_NOP;
oa.start = p1;
oa.end = p2;
oa.start_vcol = MIN(sc1, sc2);
if (*p_sel == 'e' && ec1 < sc2 && 0 < sc2 && ec2 > ec1) {
oap.end_vcol = sc2 - 1;
oa.end_vcol = sc2 - 1;
} else {
oap.end_vcol = MAX(ec1, ec2);
oa.end_vcol = MAX(ec1, ec2);
}
}
@ -2928,7 +2928,7 @@ static void f_getregion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
akt = xstrdup(ml_get(lnum));
} else if (region_type == kMTBlockWise) {
struct block_def bd;
block_prep(&oap, &bd, lnum, false);
block_prep(&oa, &bd, lnum, false);
akt = block_def2str(&bd);
} else if (p1.lnum < lnum && lnum < p2.lnum) {
akt = xstrdup(ml_get(lnum));