diff options
| -rw-r--r-- | src/nvim/terminal.c | 3 | ||||
| -rw-r--r-- | src/vterm/parser.c | 14 | ||||
| -rw-r--r-- | test/functional/terminal/parser_spec.lua | 15 |
3 files changed, 27 insertions, 5 deletions
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 2b44763ddd..43f68f7321 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -271,10 +271,11 @@ static int parse_osc8(VTermStringFragment frag, int *attr) } static int on_osc(int command, VTermStringFragment frag, void *user) + FUNC_ATTR_NONNULL_ALL { Terminal *term = user; - if (frag.str == NULL) { + if (frag.str == NULL || frag.len == 0) { return 0; } diff --git a/src/vterm/parser.c b/src/vterm/parser.c index b43a549cef..84d017a791 100644 --- a/src/vterm/parser.c +++ b/src/vterm/parser.c @@ -1,5 +1,6 @@ #include "vterm_internal.h" +#include <assert.h> #include <stdio.h> #include <string.h> @@ -190,8 +191,10 @@ size_t vterm_input_write(VTerm *vt, const char *bytes, size_t len) ((!IS_STRING_STATE() || c == 0x5c))) { c += 0x40; c1_allowed = true; - if(string_len) + if(string_len) { + assert(string_len > 0); string_len -= 1; + } vt->parser.in_esc = false; } else { @@ -377,9 +380,12 @@ string_state: if(string_start) { size_t string_len = bytes + pos - string_start; - if(vt->parser.in_esc) - string_len -= 1; - string_fragment(vt, string_start, string_len, false); + if (string_len > 0) { + if(vt->parser.in_esc) { + string_len -= 1; + } + string_fragment(vt, string_start, string_len, false); + } } return len; diff --git a/test/functional/terminal/parser_spec.lua b/test/functional/terminal/parser_spec.lua new file mode 100644 index 0000000000..67f47c7888 --- /dev/null +++ b/test/functional/terminal/parser_spec.lua @@ -0,0 +1,15 @@ +local n = require('test.functional.testnvim')() + +local clear = n.clear +local api = n.api +local assert_alive = n.assert_alive + +describe(':terminal', function() + before_each(clear) + + it('handles invalid OSC terminators #30084', function() + local chan = api.nvim_open_term(0, {}) + api.nvim_chan_send(chan, '\027]8;;https://example.com\027\\Example\027]8;;\027\n') + assert_alive() + end) +end) |