Mercurial > vim
changeset 5401:e7a2f217a385 v7.4.051
updated for version 7.4.051
Problem: Syntax highlighting a Yaml file causes a crash. (Blake Preston)
Solution: Copy the pim structure before calling addstate() to avoid it
becoming invalide when the state list is reallocated.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Sun, 06 Oct 2013 15:46:11 +0200 |
parents | 173c9c860e42 |
children | 8d1edeae0e62 |
files | src/regexp_nfa.c src/version.c |
diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -6458,6 +6458,7 @@ nfa_regmatch(prog, start, submatch, m) if (add_state != NULL) { nfa_pim_T *pim; + nfa_pim_T pim_copy; if (t->pim.result == NFA_PIM_UNUSED) pim = NULL; @@ -6531,6 +6532,15 @@ nfa_regmatch(prog, start, submatch, m) pim = NULL; } + /* If "pim" points into l->t it will become invalid when + * adding the state causes the list to be reallocated. Make a + * local copy to avoid that. */ + if (pim == &t->pim) + { + copy_pim(&pim_copy, pim); + pim = &pim_copy; + } + if (add_here) addstate_here(thislist, add_state, &t->subs, pim, &listidx); else