diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-10-26 20:45:24 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-10-26 20:45:24 +0200 |
commit | 7ab5d77666c98f5229759402a451a26ea57a4801 (patch) | |
tree | a29695645e55ae0584ef0a962a8c58da7f2f4f69 /src | |
parent | 96f45c0b6fc9e9d404e6805593ed1e0e6795e470 (diff) |
patch 8.1.2222: accessing invalid memoryv8.1.2222
Problem: Accessing invalid memory. (Dominique Pelle)
Solution: Reset highlight_match every time. (closes #5125)
Diffstat (limited to 'src')
-rw-r--r-- | src/ex_getln.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 45a0a36321..9c98f99bab 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -525,6 +525,7 @@ may_do_incsearch_highlighting( curwin->w_redr_status = TRUE; update_screen(SOME_VALID); + highlight_match = FALSE; restore_last_search_pattern(); // Leave it at the end to make CTRL-R CTRL-W work. But not when beyond the @@ -642,6 +643,7 @@ may_adjust_incsearch_highlighting( highlight_match = TRUE; save_viewstate(&is_state->old_viewstate); update_screen(NOT_VALID); + highlight_match = FALSE; redrawcmdline(); curwin->w_cursor = is_state->match_end; } diff --git a/src/version.c b/src/version.c index 718ad6528f..2d0c84ec63 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 */ /**/ + 2222, +/**/ 2221, /**/ 2220, |