aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.5092: using "'<,'>" in Ex mode may compare unrelated pointers

Browse Source 
Problem:    Using "'<,'>" in Ex mode may compare unrelated pointers.
Solution:   Set eap->cmd to "+" only later.
This commit is contained in:
Bram Moolenaar
2022-06-14 15:43:18 +01:00
parent e564c7009d
commit 48ce135e6d
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ex_docmd.c
View File

@@ -2786,8 +2786,7 @@ parse_command_modifiers(
{ {
char_u *orig_cmd = eap->cmd; char_u *orig_cmd = eap->cmd;
char_u *cmd_start = NULL; char_u *cmd_start = NULL;
int did_plus_cmd = FALSE; int use_plus_cmd = FALSE;
char_u *p;
int starts_with_colon = FALSE; int starts_with_colon = FALSE;
int vim9script = in_vim9script(); int vim9script = in_vim9script();
int has_visual_range = FALSE; int has_visual_range = FALSE;
@@ -2799,7 +2798,9 @@ parse_command_modifiers(
{ {
// The automatically inserted Visual area range is skipped, so that // The automatically inserted Visual area range is skipped, so that
// typing ":cmdmod cmd" in Visual mode works without having to move the // typing ":cmdmod cmd" in Visual mode works without having to move the
// range to after the modififiers. // range to after the modififiers. The command will be
// "'<,'>cmdmod cmd", parse "cmdmod cmd" and then put back "'<,'>"
// before "cmd" below.
eap->cmd += 5; eap->cmd += 5;
cmd_start = eap->cmd; cmd_start = eap->cmd;
has_visual_range = TRUE; has_visual_range = TRUE;
@@ -2808,6 +2809,8 @@ parse_command_modifiers(
// Repeat until no more command modifiers are found. // Repeat until no more command modifiers are found.
for (;;) for (;;)
{ {
char_u *p;
while (*eap->cmd == ' ' || *eap->cmd == '\t' || *eap->cmd == ':') while (*eap->cmd == ' ' || *eap->cmd == '\t' || *eap->cmd == ':')
{ {
if (*eap->cmd == ':') if (*eap->cmd == ':')
@@ -2815,16 +2818,16 @@ parse_command_modifiers(
++eap->cmd; ++eap->cmd;
} }
// in ex mode, an empty line works like :+ // in ex mode, an empty command (after modifiers) works like :+
if (*eap->cmd == NUL && exmode_active if (*eap->cmd == NUL && exmode_active
&& (getline_equal(eap->getline, eap->cookie, getexmodeline) && (getline_equal(eap->getline, eap->cookie, getexmodeline)
|| getline_equal(eap->getline, eap->cookie, getexline)) || getline_equal(eap->getline, eap->cookie, getexline))
&& curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)
{ {
eap->cmd = (char_u *)"+"; use_plus_cmd = TRUE;
did_plus_cmd = TRUE;
if (!skip_only) if (!skip_only)
ex_pressedreturn = TRUE; ex_pressedreturn = TRUE;
break; // no modifiers following
} }
// ignore comment and empty lines // ignore comment and empty lines
@@ -3108,12 +3111,12 @@ parse_command_modifiers(
// Since the modifiers have been parsed put the colon on top of the // Since the modifiers have been parsed put the colon on top of the
// space: "'<,'>mod cmd" -> "mod:'<,'>cmd // space: "'<,'>mod cmd" -> "mod:'<,'>cmd
// Put eap->cmd after the colon. // Put eap->cmd after the colon.
if (did_plus_cmd) if (use_plus_cmd)
{ {
size_t len = STRLEN(cmd_start); size_t len = STRLEN(cmd_start);
// Special case: empty command may have been changed to "+": // Special case: empty command uses "+":
// "'<,'>mod" -> "mod'<,'>+ // "'<,'>mods" -> "mods'<,'>+
mch_memmove(orig_cmd, cmd_start, len); mch_memmove(orig_cmd, cmd_start, len);
STRCPY(orig_cmd + len, "'<,'>+"); STRCPY(orig_cmd + len, "'<,'>+");
} }
@@ -3126,12 +3129,14 @@ parse_command_modifiers(
} }
else else
// No modifiers, move the pointer back. // No modifiers, move the pointer back.
// Special case: empty command may have been changed to "+". // Special case: change empty command to "+".
if (did_plus_cmd) if (use_plus_cmd)
eap->cmd = (char_u *)"'<,'>+"; eap->cmd = (char_u *)"'<,'>+";
else else
eap->cmd = orig_cmd; eap->cmd = orig_cmd;
} }
else if (use_plus_cmd)
eap->cmd = (char_u *)"+";
return OK; return OK;
} }

2
src/version.c
View File

@@ -734,6 +734,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 */
/**/
5092,
/**/ /**/
5091, 5091,
/**/ /**/