diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-03-22 15:02:19 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-22 18:43:01 +0100 |
| commit | c398402f1225e8050856260cbc6ae929ff2f5c31 (patch) | |
| tree | 1970d355f0d58dfbedd653c267070c28ee0c5bef /src/nvim/charset.c | |
| parent | 830b31683e9958130a64b9dec990f42b58efc0a7 (diff) | |
| download | rneovim-c398402f1225e8050856260cbc6ae929ff2f5c31.tar.gz rneovim-c398402f1225e8050856260cbc6ae929ff2f5c31.tar.bz2 rneovim-c398402f1225e8050856260cbc6ae929ff2f5c31.zip | |
vim-patch:8.0.0307
Problem: Asan detects a memory error when EXITFREE is defined. (Dominique
Pelle)
Solution: In getvcol() check for ml_get_buf() returning an empty string.
Also skip adjusting the scroll position. Set "exiting" in
mch_exit() for all systems.
https://github.com/vim/vim/commit/955f198fc546cc30a34361932d3f454a61df0efa
Diffstat (limited to 'src/nvim/charset.c')
| -rw-r--r-- | src/nvim/charset.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 9e240fd38b..f31cef5886 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -1160,6 +1160,11 @@ void getvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, // continue until the NUL posptr = NULL; } else { + // Special check for an empty line, which can happen on exit, when + // ml_get_buf() always returns an empty string. + if (*ptr == NUL) { + pos->col = 0; + } posptr = ptr + pos->col; } |