vim-patch:7.4.519

Problem:    Crash when using syntax highlighting.
Solution:   When regprog is freed and replaced, store the result.

https://github.com/vim/vim/tree/v7-4-519

Helped-by: Scott Prager <splinterofchaos@gmail.com>
This commit is contained in:
David Bürgin
2015-04-03 21:08:49 +02:00
committed by Justin M. Keyes
parent 4230f8c332
commit b3519ca73b
7 changed files with 90 additions and 87 deletions

View File

@@ -687,7 +687,6 @@ debuggy_find (
{
struct debuggy *bp;
linenr_T lnum = 0;
regmatch_T regmatch;
char_u *name = fname;
int prev_got_int;
@@ -709,8 +708,6 @@ debuggy_find (
if (((bp->dbg_type == DBG_FILE) == file && (
gap == &prof_ga ||
(bp->dbg_lnum > after && (lnum == 0 || bp->dbg_lnum < lnum))))) {
regmatch.regprog = bp->dbg_prog;
regmatch.rm_ic = FALSE;
/*
* Save the value of got_int and reset it. We don't want a
* previous interruption cancel matching, only hitting CTRL-C
@@ -718,7 +715,7 @@ debuggy_find (
*/
prev_got_int = got_int;
got_int = FALSE;
if (vim_regexec(&regmatch, name, (colnr_T)0)) {
if (vim_regexec_prog(&bp->dbg_prog, false, name, (colnr_T)0)) {
lnum = bp->dbg_lnum;
if (fp != NULL)
*fp = bp->dbg_forceit;