patch 8.2.0133: invalid memory access with search command

Problem:    Invalid memory access with search command.
Solution:   When :normal runs out of characters in bracketed paste mode break
            out of the loop.(closes #5511)

diff --git a/src/edit.c b/src/edit.c
index 8160fe56930ace1d393a4081f58fd3789412f108..f2ae425fab1c9396ccfef080a21706600e1cf514 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -4959,9 +4959,9 @@ bracketed_paste(paste_mode_T mode, int drop, garray_T *gap)
        do
            c = vgetc();
        while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
-       if (c == NUL || got_int)
+       if (c == NUL || got_int || (ex_normal_busy > 0 && c == Ctrl_C))
            // When CTRL-C was encountered the typeahead will be flushed and we
-           // won't get the end sequence.
+           // won't get the end sequence.  Except when using ":normal".
            break;
 
        if (has_mbyte)

diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 5030deea97cf4085f7758a250ba9b403e3cb91d3..60152f602b63d31759b63403f3b3807224e4e24a 100644 (file)
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -1449,3 +1449,8 @@ func Test_searchdecl()
 
   bwipe!
 endfunc
+
+func Test_search_special()
+  " this was causing illegal memory access
+  exe "norm /\x80PS"
+endfunc

diff --git a/src/version.c b/src/version.c
index 2fb0fc3067c173336b0421abd3bf9949a4368573..6b905515437aebf6bbf44f8cd93b3ea8a44aee50 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    133,
 /**/
     132,
 /**/