1
0
forked from aniani/vim

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)
This commit is contained in:
Bram Moolenaar
2018-02-09 16:04:25 +01:00
parent 02ae9b4a93
commit 9d32276b52
2 changed files with 11 additions and 0 deletions

View File

@@ -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. */

View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1483,
/**/
1482,
/**/