IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0913: CI crashes when running out of memory

Browse Source 
Problem:    CI crashes when running out of memory.
Solution:   Apply 'maxmempattern' also to new regexp engine.
688b3983d8
This commit is contained in:
Jan Edmund Lazo 2019-07-25 02:50:33 -04:00
parent 52488ea6fb
commit 98fcf66b7a
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/regexp_nfa.c
View File

@ -4079,11 +4079,17 @@ skip_add:
goto skip_add; goto skip_add;
} }
/* When there are backreferences or PIMs the number of states may // When there are backreferences or PIMs the number of states may
* be (a lot) bigger than anticipated. */ // be (a lot) bigger than anticipated.
if (l->n == l->len) { if (l->n == l->len) {
const int newlen = l->len * 3 / 2 + 50; const int newlen = l->len * 3 / 2 + 50;
const size_t newsize = newlen * sizeof(nfa_thread_T);
if ((long)(newsize >> 10) >= p_mmp) {
EMSG(_(e_maxmempat));
depth--;
return NULL;
}
if (subs != &temp_subs) { if (subs != &temp_subs) {
/* "subs" may point into the current array, need to make a /* "subs" may point into the current array, need to make a
* copy before it becomes invalid. */ * copy before it becomes invalid. */
@ -4093,7 +4099,7 @@ skip_add:
subs = &temp_subs; subs = &temp_subs;
} }
nfa_thread_T *const newt = xrealloc(l->t, newlen * sizeof(*newt)); nfa_thread_T *const newt = xrealloc(l->t, newsize);
l->t = newt; l->t = newt;
l->len = newlen; l->len = newlen;
} }
@ -4364,8 +4370,13 @@ static regsubs_T *addstate_here(
/* not enough space to move the new states, reallocate the list /* not enough space to move the new states, reallocate the list
* and move the states to the right position */ * and move the states to the right position */
const int newlen = l->len * 3 / 2 + 50; const int newlen = l->len * 3 / 2 + 50;
const size_t newsize = newlen * sizeof(nfa_thread_T);
nfa_thread_T *const newl = xmalloc(newlen * sizeof(*newl)); if ((long)(newsize >> 10) >= p_mmp) {
EMSG(_(e_maxmempat));
return NULL;
}
nfa_thread_T *const newl = xmalloc(newsize);
l->len = newlen; l->len = newlen;
memmove(&(newl[0]), memmove(&(newl[0]),
&(l->t[0]), &(l->t[0]),