circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix crash

pull/3507/head
Marc Reisner 2023-04-22 00:58:43 -05:00
parent 6571d44b88
commit dad2c9bbd5
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
window-copy.c
View File

@ -5040,25 +5040,13 @@ window_copy_copy_line(struct window_mode_entry *wme, char **buf, size_t *off,
struct grid_cell *lastgc = NULL;
struct grid_line *gl;
struct utf8_data ud;
u_int i, xx, wrapped = 0;
const char *s;
char *raws;
u_int rawlen;
u_int i, xx, wrapped = 0, rawlen;
const char *s, *raws;
if (sx > ex)
return;
if (raw)
{
raws = grid_string_cells(gd, sx, sy, (ex - sx + 1), &lastgc, GRID_STRING_WITH_SEQUENCES, wme->screen);
rawlen = strlen(raws);
memcpy(*buf + *off, raws, rawlen);
*off += rawlen;
free(raws);
return;
}
/*
* Work out if the line was wrapped at the screen edge and all of it is
* on screen.
@ -5079,7 +5067,18 @@ window_copy_copy_line(struct window_mode_entry *wme, char **buf, size_t *off,
if (sx < ex) {
for (i = sx; i < ex; i++) {
if (raw) {
raws = grid_string_cells(gd, i, sy, 1, &lastgc, GRID_STRING_WITH_SEQUENCES, wme->screen);
rawlen = strlen(raws);
*buf = xrealloc(*buf, (*off) + rawlen);
memcpy(*buf + *off, raws, rawlen);
*off += rawlen;
continue;
}
grid_get_cell(gd, i, sy, &gc);
if (gc.flags & GRID_FLAG_PADDING)
continue;
utf8_copy(&ud, &gc.data);