mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-22 11:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14194 from bfredl/provide_virt

Browse Source 
memory error with ephemeral virt_text
This commit is contained in:
Björn Linse
2021-03-23 15:54:09 +01:00
committed by GitHub
parent a1a0bc618f 06c191848b
commit ed20089877
4 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/screen.c
View File

@@ -3922,9 +3922,8 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
.hl_id = hl_err }));
do_virttext = true;
} else if (has_decor) {
VirtText *vp = decor_redraw_virt_text(wp->w_buffer, &decor_state);
if (vp) {
virt_text = *vp;
virt_text = decor_redraw_virt_text(wp->w_buffer, &decor_state);
if (kv_size(virt_text)) {
do_virttext = true;
}
}
@@ -4354,10 +4353,10 @@ void draw_virt_text(buf_T *buf, int *end_col, int max_col)
DecorState *state = &decor_state;
for (size_t i = 0; i < kv_size(state->active); i++) {
HlRange *item = &kv_A(state->active, i);
if (item->start_row == state->row && item->virt_text
if (item->start_row == state->row && kv_size(item->virt_text)
&& item->virt_text_pos == kVTOverlay
&& item->virt_col >= 0) {
VirtText vt = *item->virt_text;
VirtText vt = item->virt_text;
LineState s = LINE_STATE("");
int virt_attr = 0;
int col = item->virt_col;