From 9d32276b52a63fccfae681f0d1d6ccb66efec1c0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 9 Feb 2018 16:04:25 +0100
Subject: [PATCH] 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)
---
 src/search.c  | 9 +++++++++
 src/version.c | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/search.c b/src/search.c
index 42351d5e6..efcf3d96a 100644
--- 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. */
diff --git a/src/version.c b/src/version.c
index 528556587..7e07f7735 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1483,
 /**/
     1482,
 /**/
-- 
2.50.1