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:
@@ -973,7 +973,16 @@ searchit(
|
|||||||
NULL, NULL
|
NULL, NULL
|
||||||
#endif
|
#endif
|
||||||
)) == 0)
|
)) == 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;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
/* Need to get the line pointer again, a
|
/* Need to get the line pointer again, a
|
||||||
* multi-line search may have made it invalid. */
|
* multi-line search may have made it invalid. */
|
||||||
|
@@ -771,6 +771,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1483,
|
||||||
/**/
|
/**/
|
||||||
1482,
|
1482,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user