commit bcf9442307075bac40d44328c8bf7ea21857b138
author Bram Moolenaar <Bram@vim.org> Sat Jun 23 14:21:42 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Jun 23 14:21:42 2018 +0200
tree 6890b363128e8cbffe09b274ecd1b1665393fac1
parent 5efa0102de6ed6049fb19e1e83787e5b3b24b6a2

patch 8.1.0098: segfault when pattern with \z() is very slow

Problem:    Segfault when pattern with \z() is very slow.
Solution:   Check for NULL regprog.  Add "nfa_fail" to test_override() to be
            able to test this.  Fix that 'searchhl' resets called_emsg.

src/screen.c

diff --git a/src/screen.c b/src/screen.c
index 3dde1b7..b7b3e67 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7868,6 +7868,7 @@
     linenr_T	l;
     colnr_T	matchcol;
     long	nmatched;
+    int		save_called_emsg = called_emsg;
 
     if (shl->lnum != 0)
     {
@@ -7986,6 +7987,9 @@
 	    break;			/* useful match found */
 	}
     }
+
+    // Restore called_emsg for assert_fails().
+    called_emsg = save_called_emsg;
 }
 
 /*