aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-13 22:54:27 -05:00
Code Activity

updated for version 7.3.1272

Browse Source 
Problem:    Crash when editing Ruby file. (Aliaksandr Rahalevich)
Solution:   Reallocate the state list when necessary.
This commit is contained in:
Bram Moolenaar
2013-06-30 13:17:24 +02:00
parent a4c8dcbdae
commit 55480dccf4
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/regexp_nfa.c
View File

@@ -4228,14 +4228,39 @@ addstate_here(l, state, subs, pim, ip)
}
else if (count > 1)
{
/* make space for new states, then move them from the
* end to the current position */
mch_memmove(&(l->t[listidx + count]),
&(l->t[listidx + 1]),
sizeof(nfa_thread_T) * (l->n - listidx - 1));
mch_memmove(&(l->t[listidx]),
&(l->t[l->n - 1]),
sizeof(nfa_thread_T) * count);
if (l->n + count - 1 >= l->len)
{
/* not enough space to move the new states, reallocate the list
* and move the states to the right position */
nfa_thread_T *newl;
l->len = l->len * 3 / 2 + 50;
newl = (nfa_thread_T *)alloc(l->len * sizeof(nfa_thread_T));
if (newl == NULL)
return;
mch_memmove(&(newl[0]),
&(l->t[0]),
sizeof(nfa_thread_T) * listidx);
mch_memmove(&(newl[listidx]),
&(l->t[l->n - count]),
sizeof(nfa_thread_T) * count);
mch_memmove(&(newl[listidx + count]),
&(l->t[listidx + 1]),
sizeof(nfa_thread_T) * (l->n - count - listidx - 1));
vim_free(l->t);
l->t = newl;
}
else
{
/* make space for new states, then move them from the
* end to the current position */
mch_memmove(&(l->t[listidx + count]),
&(l->t[listidx + 1]),
sizeof(nfa_thread_T) * (l->n - listidx - 1));
mch_memmove(&(l->t[listidx]),
&(l->t[l->n - 1]),
sizeof(nfa_thread_T) * count);
}
}
--l->n;
*ip = listidx - 1;

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1272,
/**/
1271,
/**/