diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-06-28 22:23:00 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-06-28 22:23:00 +0200 |
commit | 307ac5c68e9e624ab713136d79f35bb73f780d2d (patch) | |
tree | e0d413bd5431690d4331b94cc6a4ab46e0ed2e43 /src/screen.c | |
parent | 630afe889a2a02b367ea8eaaa48e66ed81e77ff3 (diff) | |
download | vim-git-307ac5c68e9e624ab713136d79f35bb73f780d2d.tar.gz |
patch 8.1.0126: various problems with 'vartabstop'v8.1.0126
Problem: Various problems with 'vartabstop'.
Solution: Fix memory leak. Fix crash. Add a few more tests. (Christian
Brabandt, closes #3076)
Diffstat (limited to 'src/screen.c')
-rw-r--r-- | src/screen.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/screen.c b/src/screen.c index c03443fec..954beef95 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4753,13 +4753,13 @@ win_line( n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, NULL) - 1; if (c == TAB && n_extra + col > wp->w_width) -#ifdef FEAT_VARTABS +# ifdef FEAT_VARTABS n_extra = tabstop_padding(vcol, wp->w_buffer->b_p_ts, - wp->w_buffer->b_p_vts_array) - 1; -#else + wp->w_buffer->b_p_vts_array) - 1; +# else n_extra = (int)wp->w_buffer->b_p_ts - vcol % (int)wp->w_buffer->b_p_ts - 1; - #endif +# endif # ifdef FEAT_MBYTE c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; @@ -4902,6 +4902,11 @@ win_line( p_extra_free = p; for (i = 0; i < tab_len; i++) { + if (*p == NUL) + { + tab_len = i; + break; + } #ifdef FEAT_MBYTE mb_char2bytes(lcs_tab2, p); p += mb_char2len(lcs_tab2); |