Skip to content

Commit

Permalink
patch 8.1.0985: crash with large number in regexp
Browse files Browse the repository at this point in the history
Problem:    Crash with large number in regexp. (Kuang-che Wu)
Solution:   Check for long becoming negative int. (closes #)
  • Loading branch information
brammool committed Feb 28, 2019
1 parent c69efcb commit ab350f8
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/regexp.c
Expand Up @@ -2228,7 +2228,7 @@ regatom(int *flagp)
default: i = -1; break;
}

if (i < 0)
if (i < 0 || i > INT_MAX)
EMSG2_RET_NULL(
_("E678: Invalid character after %s%%[dxouU]"),
reg_magic == MAGIC_ALL);
Expand Down Expand Up @@ -3293,7 +3293,7 @@ coll_get_char(void)
case 'u': nr = gethexchrs(4); break;
case 'U': nr = gethexchrs(8); break;
}
if (nr < 0)
if (nr < 0 || nr > INT_MAX)
{
/* If getting the number fails be backwards compatible: the character
* is a backslash. */
Expand Down
25 changes: 24 additions & 1 deletion src/testdir/test_search.vim
Expand Up @@ -1212,13 +1212,36 @@ func Test_search_Ctrl_L_combining()
call Incsearch_cleanup()
endfunc

func Test_large_hex_chars()
func Test_large_hex_chars1()
" This used to cause a crash, the character becomes an NFA state.
try
/\%Ufffffc23
catch
call assert_match('E678:', v:exception)
endtry
try
set re=1
/\%Ufffffc23
catch
call assert_match('E678:', v:exception)
endtry
set re&
endfunc

func Test_large_hex_chars2()
" This used to cause a crash, the character becomes an NFA state.
try
/[\Ufffffc1f]
catch
call assert_match('E486:', v:exception)
endtry
try
set re=1
/[\Ufffffc1f]
catch
call assert_match('E486:', v:exception)
endtry
set re&
endfunc

func Test_one_error_msg()
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -779,6 +779,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
985,
/**/
984,
/**/
Expand Down

0 comments on commit ab350f8

Please sign in to comment.