diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-03 18:55:38 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-03 18:55:38 +0200 |
| commit | c5acc0f7fed6b061d994fc5ac660dcc0312750bd (patch) | |
| tree | e62032d493ae005c685ab2fe51518efcce697aec | |
| parent | cc836556d962058d8b8fbc45c400b7e9d643976a (diff) | |
| download | vim-git-c5acc0f7fed6b061d994fc5ac660dcc0312750bd.tar.gz | |
patch 8.2.0892: ubsan warns for undefined behaviorv8.2.0892
Problem: Ubsan warns for undefined behavior.
Solution: Use unsigned instead of signed variable. (Dominique Pelle,
closes #6193)
| -rw-r--r-- | src/regexp_nfa.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 26a8f356b..465797dd3 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -246,6 +246,7 @@ static int nfa_classcodes[] = { static char_u e_nul_found[] = N_("E865: (NFA) Regexp end encountered prematurely"); static char_u e_misplaced[] = N_("E866: (NFA regexp) Misplaced %c"); static char_u e_ill_char_class[] = N_("E877: (NFA regexp) Invalid character class: %d"); +static char_u e_value_too_large[] = N_("E951: \\% value too large"); // Variables only used in nfa_regcomp() and descendants. static int nfa_re_flags; // re_flags passed to nfa_regcomp() @@ -1541,19 +1542,27 @@ nfa_regatom(void) default: { - long n = 0; + long_u n = 0; int cmp = c; if (c == '<' || c == '>') c = getchr(); while (VIM_ISDIGIT(c)) { - n = n * 10 + (c - '0'); + long_u tmp = n * 10 + (c - '0'); + + if (tmp < n) + { + // overflow. + emsg(_(e_value_too_large)); + return FAIL; + } + n = tmp; c = getchr(); } if (c == 'l' || c == 'c' || c == 'v') { - int limit = INT_MAX; + long_u limit = INT_MAX; if (c == 'l') { @@ -1576,7 +1585,7 @@ nfa_regatom(void) } if (n >= limit) { - emsg(_("E951: \\% value too large")); + emsg(_(e_value_too_large)); return FAIL; } EMIT((int)n); diff --git a/src/version.c b/src/version.c index b0fd4b3de..a241fa0a2 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 892, +/**/ 891, /**/ 890, |