# HG changeset patch # User Bram Moolenaar # Date 1550784606 -3600 # Node ID 98d315176d485f46dfd4a8b8a974cdfb5e6e7115 # Parent 5818bd3610d1ec379e6837283279db007e85b7c6 patch 8.1.0968: crash when using search pattern %Ufffffc23 commit https://github.com/vim/vim/commit/527a2d86fb375fcc7b34e80fc47f4c7126fc12ba Author: Bram Moolenaar Date: Thu Feb 21 22:28:51 2019 +0100 patch 8.1.0968: crash when using search pattern \%Ufffffc23 Problem: Crash when using search pattern \%Ufffffc23. Solution: Limit character to INT_MAX. (closes https://github.com/vim/vim/issues/4009) diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -1475,7 +1475,7 @@ nfa_regatom(void) default: nr = -1; break; } - if (nr < 0) + if (nr < 0 || nr > INT_MAX) EMSG2_RET_FAIL( _("E678: Invalid character after %s%%[dxouU]"), reg_magic == MAGIC_ALL); diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -1211,3 +1211,12 @@ func Test_search_Ctrl_L_combining() call assert_equal(bufcontent[1], @/) call Incsearch_cleanup() endfunc + +func Test_large_hex_chars() + " This used to cause a crash, the character becomes an NFA state. + try + /\%Ufffffc23 + catch + call assert_match('E678:', v:exception) + endtry +endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 968, +/**/ 967, /**/ 966,