sharpetronics/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-12-17 00:02:23 -05:00
Code Issues Projects Releases Wiki Activity

Do not read over buffer if format is a single #, and do not loop forever

Browse Source 
if UTF-8 is unfinished in a format. Reported by Giorgi Kobakhia im
GitHub issue 4735.
This commit is contained in:
nicm 2025-12-04 20:49:57 +00:00
parent 9d6c69ebde
commit bd16b22dac
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
format-draw.c
View File

@ -1104,8 +1104,6 @@ format_width(const char *expanded)
more = utf8_append(&ud, *cp); more = utf8_append(&ud, *cp);
if (more == UTF8_DONE) if (more == UTF8_DONE)
width += ud.width; width += ud.width;
else
cp -= ud.have;
} else if (*cp > 0x1f && *cp < 0x7f) { } else if (*cp > 0x1f && *cp < 0x7f) {
width++; width++;
cp++; cp++;

3
format.c
View File

@ -5541,7 +5541,8 @@ format_expand1(struct format_expand_state *es, const char *fmt)
buf[off++] = *fmt++; buf[off++] = *fmt++;
continue; continue;
} }
fmt++; if (*fmt++ == '\0')
break;
ch = (u_char)*fmt++; ch = (u_char)*fmt++;
switch (ch) { switch (ch) {