aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/mark.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-09-14 19:12:18 +0200
committerGitHub <noreply@github.com>2018-09-14 19:12:18 +0200
commit1bc44a805a2c9213ebe2c0603dfc714c306f50ac (patch)
tree65acbe67531cd0f340d350a313ee39cfb7e7bc4d /src/nvim/mark.c
parentae8515a5448d65856388f5104044e58702f82b1e (diff)
parent315a8d22172de9bcf45bb86a0bf31640c626fcce (diff)
downloadrneovim-1bc44a805a2c9213ebe2c0603dfc714c306f50ac.tar.gz
rneovim-1bc44a805a2c9213ebe2c0603dfc714c306f50ac.tar.bz2
rneovim-1bc44a805a2c9213ebe2c0603dfc714c306f50ac.zip
Merge #8993 from janlazo/vim-8.0.1184
Diffstat (limited to 'src/nvim/mark.c')
-rw-r--r--src/nvim/mark.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index 5366fa4b7f..05f78c76bc 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -599,9 +599,10 @@ static char_u *mark_line(pos_T *mp, int lead_len)
if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count)
return vim_strsave((char_u *)"-invalid-");
assert(Columns >= 0 && (size_t)Columns <= SIZE_MAX);
- s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (size_t)Columns);
+ // Allow for up to 5 bytes per character.
+ s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (size_t)Columns * 5);
- /* Truncate the line to fit it in the window */
+ // Truncate the line to fit it in the window
len = 0;
for (p = s; *p != NUL; MB_PTR_ADV(p)) {
len += ptr2cells(p);