From: Bram Moolenaar Date: Sat, 20 Jul 2019 16:56:06 +0000 (+0200) Subject: patch 8.1.1720: crash with very long %[] pattern X-Git-Tag: v8.1.1720 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a5b52758bb327b89d22660cc28c157ec29782e5;p=vim patch 8.1.1720: crash with very long %[] pattern Problem: Crash with very long %[] pattern. (Reza Mirzazade farkhani) Solution: Check for reg_toolong. (closes #4703) --- diff --git a/src/regexp.c b/src/regexp.c index 567604466..7d0ac6068 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -2175,7 +2175,11 @@ regatom(int *flagp) if (ret == NULL) ret = br; else + { regtail(lastnode, br); + if (reg_toolong) + return NULL; + } ungetchr(); one_exactly = TRUE; @@ -2200,6 +2204,8 @@ regatom(int *flagp) if (OP(br) == BRANCH) { regtail(br, lastbranch); + if (reg_toolong) + return NULL; br = OPERAND(br); } else diff --git a/src/testdir/test_regexp_utf8.vim b/src/testdir/test_regexp_utf8.vim index 98b9e73de..19ff882be 100644 --- a/src/testdir/test_regexp_utf8.vim +++ b/src/testdir/test_regexp_utf8.vim @@ -206,3 +206,12 @@ func Test_large_class() call assert_equal(1, "\u3042" =~# '[\u3000-\u4000]') set re=0 endfunc + +func Test_optmatch_toolong() + set re=1 + " Can only handle about 8000 characters. + let pat = '\\%[' .. repeat('x', 9000) .. ']' + call assert_fails('call match("abc def", "' .. pat .. '")', 'E339:') + set re=0 +endfunc + diff --git a/src/version.c b/src/version.c index 0de988723..756818629 100644 --- a/src/version.c +++ b/src/version.c @@ -777,6 +777,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1720, /**/ 1719, /**/