Mercurial > vim
changeset 13217:891b821d3602 v8.0.1483
patch 8.0.1483: searchpair() might return an invalid value on timeout
commit https://github.com/vim/vim/commit/9d32276b52a63fccfae681f0d1d6ccb66efec1c0
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Feb 9 16:04:25 2018 +0100
patch 8.0.1483: searchpair() might return an invalid value on timeout
Problem: Searchpair() might return an invalid value on timeout.
Solution: When the second search times out, do not accept a match from the
first search. (Daniel Hahler, closes #2552)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 09 Feb 2018 16:15:05 +0100 |
parents | 033bca1153e7 |
children | 146652fabe82 |
files | src/search.c src/version.c |
diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/search.c +++ b/src/search.c @@ -973,7 +973,16 @@ searchit( NULL, NULL #endif )) == 0) + { +#ifdef FEAT_RELTIME + /* If the search timed out, we did find a match + * but it might be the wrong one, so that's not + * OK. */ + if (timed_out != NULL && *timed_out) + match_ok = FALSE; +#endif break; + } /* Need to get the line pointer again, a * multi-line search may have made it invalid. */