aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.4.003

Browse Source 
Problem:    Memory access error in Ruby syntax highlighting. (Christopher Chow)
Solution:   Refresh stale pointer. (James McCoy)
This commit is contained in:
Bram Moolenaar 2013-08-14 14:18:40 +02:00
parent 3f0df06c28
commit ebefd997bb
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/regexp_nfa.c
View File

@ -4120,7 +4120,7 @@ skip_add:
sub = &subs->norm; sub = &subs->norm;
} }
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
else if (state->c >= NFA_ZOPEN) else if (state->c >= NFA_ZOPEN && state->c <= NFA_ZOPEN9)
{ {
subidx = state->c - NFA_ZOPEN; subidx = state->c - NFA_ZOPEN;
sub = &subs->synt; sub = &subs->synt;
@ -4189,6 +4189,13 @@ skip_add:
} }
subs = addstate(l, state->out, subs, pim, off); subs = addstate(l, state->out, subs, pim, off);
/* "subs" may have changed, need to set "sub" again */
#ifdef FEAT_SYN_HL
if (state->c >= NFA_ZOPEN && state->c <= NFA_ZOPEN9)
sub = &subs->synt;
else
#endif
sub = &subs->norm;
if (save_in_use == -1) if (save_in_use == -1)
{ {
@ -4237,7 +4244,7 @@ skip_add:
sub = &subs->norm; sub = &subs->norm;
} }
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
else if (state->c >= NFA_ZCLOSE) else if (state->c >= NFA_ZCLOSE && state->c <= NFA_ZCLOSE9)
{ {
subidx = state->c - NFA_ZCLOSE; subidx = state->c - NFA_ZCLOSE;
sub = &subs->synt; sub = &subs->synt;
@ -4281,6 +4288,13 @@ skip_add:
} }
subs = addstate(l, state->out, subs, pim, off); subs = addstate(l, state->out, subs, pim, off);
/* "subs" may have changed, need to set "sub" again */
#ifdef FEAT_SYN_HL
if (state->c >= NFA_ZCLOSE && state->c <= NFA_ZCLOSE9)
sub = &subs->synt;
else
#endif
sub = &subs->norm;
if (REG_MULTI) if (REG_MULTI)
sub->list.multi[subidx].end = save_lpos; sub->list.multi[subidx].end = save_lpos;

2
src/version.c
View File

@ -727,6 +727,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 */
/**/
3,
/**/ /**/
2, 2,
/**/ /**/