mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-18 07:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0170: invalid memory use with complicated pattern #9724

Browse Source 
Problem:    Invalid memory use with complicated pattern. (Andy Massimino)
Solution:   Reallocate the list of listids when needed. (closes vim/vim#3175)
            Remove unnecessary function prototypes.
2338c32b53
This commit is contained in:
Jan Edmund Lazo
2019-03-12 22:16:22 -04:00
committed by Justin M. Keyes
parent 4f5e378124
commit 2af1e23278
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/regexp_nfa.c
View File

@@ -4582,7 +4582,9 @@ static bool nfa_re_num_cmp(uintmax_t val, int op, uintmax_t pos)
* "pim" is NULL or contains info about a Postponed Invisible Match (start * "pim" is NULL or contains info about a Postponed Invisible Match (start
* position). * position).
*/ */
static int recursive_regmatch(nfa_state_T *state, nfa_pim_T *pim, nfa_regprog_T *prog, regsubs_T *submatch, regsubs_T *m, int **listids) static int recursive_regmatch(
nfa_state_T *state, nfa_pim_T *pim, nfa_regprog_T *prog,
regsubs_T *submatch, regsubs_T *m, int **listids, int *listids_len)
{ {
int save_reginput_col = (int)(reginput - regline); int save_reginput_col = (int)(reginput - regline);
int save_reglnum = reglnum; int save_reglnum = reglnum;
@@ -4665,8 +4667,10 @@ static int recursive_regmatch(nfa_state_T *state, nfa_pim_T *pim, nfa_regprog_T
if (nfa_ll_index == 1) { if (nfa_ll_index == 1) {
/* Already calling nfa_regmatch() recursively. Save the lastlist[1] /* Already calling nfa_regmatch() recursively. Save the lastlist[1]
* values and clear them. */ * values and clear them. */
if (*listids == NULL) { if (*listids == NULL || *listids_len < nstate) {
xfree(*listids);
*listids = xmalloc(sizeof(**listids) * nstate); *listids = xmalloc(sizeof(**listids) * nstate);
*listids_len = nstate;
} }
nfa_save_listids(prog, *listids); nfa_save_listids(prog, *listids);
need_restore = TRUE; need_restore = TRUE;
@@ -4979,6 +4983,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
nfa_list_T *thislist; nfa_list_T *thislist;
nfa_list_T *nextlist; nfa_list_T *nextlist;
int *listids = NULL; int *listids = NULL;
int listids_len = 0;
nfa_state_T *add_state; nfa_state_T *add_state;
bool add_here; bool add_here;
int add_count; int add_count;
@@ -5271,7 +5276,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
// First try matching the invisible match, then what // First try matching the invisible match, then what
// follows. // follows.
result = recursive_regmatch(t->state, NULL, prog, submatch, m, result = recursive_regmatch(t->state, NULL, prog, submatch, m,
&listids); &listids, &listids_len);
if (result == NFA_TOO_EXPENSIVE) { if (result == NFA_TOO_EXPENSIVE) {
nfa_match = result; nfa_match = result;
goto theend; goto theend;
@@ -5372,7 +5377,7 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
// First try matching the pattern. // First try matching the pattern.
result = recursive_regmatch(t->state, NULL, prog, submatch, m, result = recursive_regmatch(t->state, NULL, prog, submatch, m,
&listids); &listids, &listids_len);
if (result == NFA_TOO_EXPENSIVE) { if (result == NFA_TOO_EXPENSIVE) {
nfa_match = result; nfa_match = result;
goto theend; goto theend;
@@ -6079,8 +6084,8 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
fprintf(log_fd, "Postponed recursive nfa_regmatch()\n"); fprintf(log_fd, "Postponed recursive nfa_regmatch()\n");
fprintf(log_fd, "\n"); fprintf(log_fd, "\n");
#endif #endif
result = recursive_regmatch(pim->state, pim, result = recursive_regmatch(pim->state, pim, prog, submatch, m,
prog, submatch, m, &listids); &listids, &listids_len);
pim->result = result ? NFA_PIM_MATCH : NFA_PIM_NOMATCH; pim->result = result ? NFA_PIM_MATCH : NFA_PIM_NOMATCH;
// for \@! and \@<! it is a match when the result is // for \@! and \@<! it is a match when the result is
// FALSE // FALSE