aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

updated for version 7.3.1018

Browse Source 
Problem:    New regexp engine wastes memory.
Solution:   Allocate prog with actual number of states, not estimated maximum
            number of sates.
This commit is contained in:
Bram Moolenaar
2013-05-25 21:18:34 +02:00
parent 4b41706477
commit aae4883e01
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/regexp_nfa.c
View File

@@ -3758,7 +3758,7 @@ nfa_regcomp(expr, re_flags)
char_u *expr;
int re_flags;
{
nfa_regprog_T *prog;
nfa_regprog_T *prog = NULL;
size_t prog_size;
int *postfix;
@@ -3774,15 +3774,8 @@ nfa_regcomp(expr, re_flags)
if (nfa_regcomp_start(expr, re_flags) == FAIL)
return NULL;
/* Space for compiled regexp */
prog_size = sizeof(nfa_regprog_T) + sizeof(nfa_state_T) * nstate_max;
prog = (nfa_regprog_T *)lalloc(prog_size, TRUE);
if (prog == NULL)
goto fail;
vim_memset(prog, 0, prog_size);
/* Build postfix form of the regexp. Needed to build the NFA
* (and count its size) */
* (and count its size). */
postfix = re2post();
if (postfix == NULL)
goto fail; /* Cascaded (syntax?) error */
@@ -3809,6 +3802,13 @@ nfa_regcomp(expr, re_flags)
* Count number of NFA states in "nstate". Do not build the NFA.
*/
post2nfa(postfix, post_ptr, TRUE);
/* Space for compiled regexp */
prog_size = sizeof(nfa_regprog_T) + sizeof(nfa_state_T) * nstate;
prog = (nfa_regprog_T *)lalloc(prog_size, TRUE);
if (prog == NULL)
goto fail;
vim_memset(prog, 0, prog_size);
state_ptr = prog->state;
/*

2
src/version.c
View File

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