Skip to content

Commit

Permalink
patch 8.0.1674: libvterm can't handle an OSC string split
Browse files Browse the repository at this point in the history
Problem:    Libvterm can't handle a long OSC string that is split.
Solution:   When an incomplete OSC string is received copy it to the parser
            buffer. Increase the size of the parser buffer to be able to
            handle longer strings.
  • Loading branch information
brammool committed Apr 7, 2018
1 parent 4791015 commit 77557a7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions src/libvterm/src/parser.c
Expand Up @@ -288,6 +288,11 @@ size_t vterm_input_write(VTerm *vt, const char *bytes, size_t len)
done_string(vt, string_start, bytes + pos - string_start);
ENTER_NORMAL_STATE();
}
else if (pos + 1 == len) {
/* end of input but OSC string isn't finished yet, copy it to
* vt->parser.strbuffer to continue it later */
more_string(vt, string_start, bytes + pos + 1 - string_start);
}
break;

case NORMAL:
Expand Down
2 changes: 1 addition & 1 deletion src/libvterm/src/vterm.c
Expand Up @@ -52,7 +52,7 @@ VTerm *vterm_new_with_allocator(int rows, int cols, VTermAllocatorFunctions *fun
vt->parser.callbacks = NULL;
vt->parser.cbdata = NULL;

vt->parser.strbuffer_len = 64;
vt->parser.strbuffer_len = 500; /* should be able to hold an OSC string */
vt->parser.strbuffer_cur = 0;
vt->parser.strbuffer = vterm_allocator_malloc(vt, vt->parser.strbuffer_len);

Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -762,6 +762,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1674,
/**/
1673,
/**/
Expand Down

0 comments on commit 77557a7

Please sign in to comment.