aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

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: #14075

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-02-22 19:51:34 +01:00 committed by Christian Brabandt
parent 421b597470
commit 5e3674b42d
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/evalfunc.c
View File

@ -5485,7 +5485,7 @@ block_def2str(struct block_def *bd)
f_getregion(typval_T *argvars, typval_T *rettv) f_getregion(typval_T *argvars, typval_T *rettv)
{ {
linenr_T lnum; linenr_T lnum;
oparg_T oap; oparg_T oa;
struct block_def bd; struct block_def bd;
char_u *akt = NULL; char_u *akt = NULL;
int inclusive = TRUE; int inclusive = TRUE;
@ -5584,16 +5584,16 @@ f_getregion(typval_T *argvars, typval_T *rettv)
getvvcol(curwin, &p1, &sc1, NULL, &ec1); getvvcol(curwin, &p1, &sc1, NULL, &ec1);
getvvcol(curwin, &p2, &sc2, NULL, &ec2); getvvcol(curwin, &p2, &sc2, NULL, &ec2);
oap.motion_type = MBLOCK; oa.motion_type = MBLOCK;
oap.inclusive = TRUE; oa.inclusive = TRUE;
oap.op_type = OP_NOP; oa.op_type = OP_NOP;
oap.start = p1; oa.start = p1;
oap.end = p2; oa.end = p2;
oap.start_vcol = MIN(sc1, sc2); oa.start_vcol = MIN(sc1, sc2);
if (*p_sel == 'e' && ec1 < sc2 && 0 < sc2 && ec2 > ec1) if (*p_sel == 'e' && ec1 < sc2 && 0 < sc2 && ec2 > ec1)
oap.end_vcol = sc2 - 1; oa.end_vcol = sc2 - 1;
else else
oap.end_vcol = MAX(ec1, ec2); oa.end_vcol = MAX(ec1, ec2);
} }
// Include the trailing byte of a multi-byte char. // Include the trailing byte of a multi-byte char.
@ -5609,7 +5609,7 @@ f_getregion(typval_T *argvars, typval_T *rettv)
akt = vim_strsave(ml_get(lnum)); akt = vim_strsave(ml_get(lnum));
else if (region_type == MBLOCK) else if (region_type == MBLOCK)
{ {
block_prep(&oap, &bd, lnum, FALSE); block_prep(&oa, &bd, lnum, FALSE);
akt = block_def2str(&bd); akt = block_def2str(&bd);
} }
else if (p1.lnum < lnum && lnum < p2.lnum) else if (p1.lnum < lnum && lnum < p2.lnum)
@ -5628,7 +5628,8 @@ f_getregion(typval_T *argvars, typval_T *rettv)
if (akt == NULL || ret == FAIL) if (akt == NULL || ret == FAIL)
{ {
list_free(rettv->vval.v_list); clear_tv(rettv);
(void)rettv_list_alloc(rettv);
break; break;
} }
} }

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
127,
/**/ /**/
126, 126,
/**/ /**/