forked from aniani/vim
patch 8.2.4688: new regexp engine does not give an error for "\%v"
Problem: New regexp engine does not give an error for "\%v". Solution: Check for a value argument. (issue #10079)
This commit is contained in:
@@ -3082,7 +3082,7 @@ EXTERN char e_no_white_space_allowed_after_str_str[]
|
||||
EXTERN char e_dot_can_only_be_used_on_dictionary_str[]
|
||||
INIT(= N_("E1203: Dot can only be used on a dictionary: %s"));
|
||||
#endif
|
||||
EXTERN char e_regexp_number_after_dot_pos_search[]
|
||||
EXTERN char e_regexp_number_after_dot_pos_search_chr[]
|
||||
INIT(= N_("E1204: No Number allowed after .: '\\%%%c'"));
|
||||
EXTERN char e_no_white_space_allowed_between_option_and[]
|
||||
INIT(= N_("E1205: No white space allowed between option and"));
|
||||
@@ -3256,3 +3256,5 @@ EXTERN char e_compiling_closure_without_context_str[]
|
||||
EXTERN char e_using_type_not_in_script_context_str[]
|
||||
INIT(= N_("E1272: Using type not in a script context: %s"));
|
||||
#endif
|
||||
EXTERN char e_nfa_regexp_missing_value_in_chr[]
|
||||
INIT(= N_("E1273: (NFA regexp) missing value in '\\%%%c'"));
|
||||
|
@@ -1649,7 +1649,8 @@ regatom(int *flagp)
|
||||
{
|
||||
if (cur && n)
|
||||
{
|
||||
semsg(_(e_regexp_number_after_dot_pos_search), no_Magic(c));
|
||||
semsg(_(e_regexp_number_after_dot_pos_search_chr),
|
||||
no_Magic(c));
|
||||
rc_did_emsg = TRUE;
|
||||
return NULL;
|
||||
}
|
||||
|
@@ -1654,7 +1654,7 @@ nfa_regatom(void)
|
||||
|
||||
if (cur)
|
||||
{
|
||||
semsg(_(e_regexp_number_after_dot_pos_search),
|
||||
semsg(_(e_regexp_number_after_dot_pos_search_chr),
|
||||
no_Magic(c));
|
||||
return FAIL;
|
||||
}
|
||||
@@ -1673,6 +1673,12 @@ nfa_regatom(void)
|
||||
{
|
||||
long_u limit = INT_MAX;
|
||||
|
||||
if (!cur && n == 0)
|
||||
{
|
||||
semsg(_(e_nfa_regexp_missing_value_in_chr),
|
||||
no_Magic(c));
|
||||
return FAIL;
|
||||
}
|
||||
if (c == 'l')
|
||||
{
|
||||
if (cur)
|
||||
|
@@ -91,6 +91,18 @@ func Test_multi_failure()
|
||||
set re=0
|
||||
endfunc
|
||||
|
||||
func Test_column_failure()
|
||||
set re=1
|
||||
call assert_fails('/\%v', 'E71:')
|
||||
call assert_fails('/\%c', 'E71:')
|
||||
call assert_fails('/\%l', 'E71:')
|
||||
set re=2
|
||||
call assert_fails('/\%v', 'E1273:')
|
||||
call assert_fails('/\%c', 'E1273:')
|
||||
call assert_fails('/\%l', 'E1273:')
|
||||
set re=0
|
||||
endfunc
|
||||
|
||||
func Test_recursive_addstate()
|
||||
" This will call addstate() recursively until it runs into the limit.
|
||||
let lnum = search('\v((){328}){389}')
|
||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
4688,
|
||||
/**/
|
||||
4687,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user