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

regexp: use fixed types to avoid overflow

Browse Source
This commit is contained in:
Jan Edmund Lazo 2019-07-24 19:55:32 -04:00
parent 33ce6a7f62
commit 8e490b98cc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/regexp_nfa.c
View File

@ -1493,13 +1493,13 @@ static int nfa_regatom(void)
default: default:
{ {
long n = 0; int64_t n = 0;
int cmp = c; const int cmp = c;
if (c == '<' || c == '>') if (c == '<' || c == '>')
c = getchr(); c = getchr();
while (ascii_isdigit(c)) { while (ascii_isdigit(c)) {
if (n > (INT_MAX - (c - '0')) / 10) { if (n > (INT32_MAX - (c - '0')) / 10) {
EMSG(_("E951: \\% value too large")); EMSG(_("E951: \\% value too large"));
return FAIL; return FAIL;
} }
@ -1507,7 +1507,7 @@ static int nfa_regatom(void)
c = getchr(); c = getchr();
} }
if (c == 'l' || c == 'c' || c == 'v') { if (c == 'l' || c == 'c' || c == 'v') {
int limit = INT_MAX; int32_t limit = INT32_MAX;
if (c == 'l') { if (c == 'l') {
// \%{n}l \%{n}<l \%{n}>l // \%{n}l \%{n}<l \%{n}>l
@ -1524,7 +1524,7 @@ static int nfa_regatom(void)
// \%{n}v \%{n}<v \%{n}>v // \%{n}v \%{n}<v \%{n}>v
EMIT(cmp == '<' ? NFA_VCOL_LT : EMIT(cmp == '<' ? NFA_VCOL_LT :
cmp == '>' ? NFA_VCOL_GT : NFA_VCOL); cmp == '>' ? NFA_VCOL_GT : NFA_VCOL);
limit = INT_MAX / MB_MAXBYTES; limit = INT32_MAX / MB_MAXBYTES;
} }
if (n >= limit) { if (n >= limit) {
EMSG(_("E951: \\% value too large")); EMSG(_("E951: \\% value too large"));