diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2020-08-25 12:40:50 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2020-09-04 23:29:51 +0200 |
| commit | b33e375b2b4e6c9232cdbfd5d6b7cb1b15e0f525 (patch) | |
| tree | ed2d0c84ed966a55bd0b1bfadfb0b8fedb434e14 /src | |
| parent | 7593c8012b1d183ce4806daca3fb50795ab969bf (diff) | |
| download | rneovim-b33e375b2b4e6c9232cdbfd5d6b7cb1b15e0f525.tar.gz rneovim-b33e375b2b4e6c9232cdbfd5d6b7cb1b15e0f525.tar.bz2 rneovim-b33e375b2b4e6c9232cdbfd5d6b7cb1b15e0f525.zip | |
robustness: avoid adding offset to NULL pointer
UBSAN with clang 10.0 is checking for adding offsets to a `NULL` pointer
which is not allowed. This is not yet checked in the version of clang
used in CI (7.0.0). I will work on cases of this so that tests passes
locally for me.
This could be tested in CI by either upgrading the clang of the
ASAN/UBSAN to 10.0, or add yet another CI target which builds with
clang 10.0.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/decode.c | 2 | ||||
| -rw-r--r-- | src/nvim/fold.c | 3 | ||||
| -rw-r--r-- | src/nvim/viml/parser/expressions.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c index daba304f00..638fef331a 100644 --- a/src/nvim/eval/decode.c +++ b/src/nvim/eval/decode.c @@ -586,7 +586,7 @@ parse_json_number_check: if (p == ints) { emsgf(_("E474: Missing number after minus sign: %.*s"), LENP(s, e)); goto parse_json_number_fail; - } else if (p == fracs || exps_s == fracs + 1) { + } else if (p == fracs || (fracs != NULL && exps_s == fracs + 1)) { emsgf(_("E474: Missing number after decimal dot: %.*s"), LENP(s, e)); goto parse_json_number_fail; } else if (p == exps) { diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 16281f40f0..c29b878491 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -2681,7 +2681,8 @@ static void foldRemove( fold_changed = true; continue; } - if (fp >= (fold_T *)(gap->ga_data) + gap->ga_len + if (gap->ga_data == NULL + || fp >= (fold_T *)(gap->ga_data) + gap->ga_len || fp->fd_top > bot) { // 6: Found a fold below bot, can stop looking. break; diff --git a/src/nvim/viml/parser/expressions.c b/src/nvim/viml/parser/expressions.c index b77b80a5f3..44b6ab5f5a 100644 --- a/src/nvim/viml/parser/expressions.c +++ b/src/nvim/viml/parser/expressions.c @@ -1431,7 +1431,7 @@ static inline void east_set_error(const ParserState *const pstate, const ParserLine pline = pstate->reader.lines.items[start.line]; ret_ast_err->msg = msg; ret_ast_err->arg_len = (int)(pline.size - start.col); - ret_ast_err->arg = pline.data + start.col; + ret_ast_err->arg = pline.data ? pline.data + start.col : NULL; } /// Set error from the given token and given message |