From fe4bbac1166f2e4e3fa18cb966ec7305198c8176 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 20 Jan 2020 21:12:20 +0100 Subject: [PATCH] patch 8.2.0135: bracketed paste can still cause invalid memory access Problem: Bracketed paste can still cause invalid memory access. (Dominique Pelle) Solution: Check for NULL pointer. --- src/edit.c | 2 +- src/testdir/test_search.vim | 3 ++- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/edit.c b/src/edit.c index f2ae425fab..70b8fee129 100644 --- a/src/edit.c +++ b/src/edit.c @@ -4942,7 +4942,7 @@ bracketed_paste(paste_mode_T mode, int drop, garray_T *gap) int save_paste = p_paste; // If the end code is too long we can't detect it, read everything. - if (STRLEN(end) >= NUMBUFLEN) + if (end != NULL && STRLEN(end) >= NUMBUFLEN) end = NULL; ++no_mapping; allow_keys = 0; diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim index 60152f602b..89ca6e1314 100644 --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -1451,6 +1451,7 @@ func Test_searchdecl() endfunc func Test_search_special() - " this was causing illegal memory access + " this was causing illegal memory access and an endless loop + set t_PE= exe "norm /\x80PS" endfunc diff --git a/src/version.c b/src/version.c index de6f9f012d..acffb43d8f 100644 --- 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 */ +/**/ + 135, /**/ 134, /**/