kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(rpc): do not crash when no input is consumed

Browse Source 
fixes #23781

Co-authored-by: glacambre <code@lacamb.re>
This commit is contained in:
bfredl 2024-03-21 10:08:31 +01:00
parent 734848dc1a
commit 8921d56053
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/rbuffer.c
View File

@ -123,7 +123,10 @@ char *rbuffer_read_ptr(RBuffer *buf, size_t *read_count) FUNC_ATTR_NONNULL_ALL
void rbuffer_consumed(RBuffer *buf, size_t count) void rbuffer_consumed(RBuffer *buf, size_t count)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
assert(count && count <= buf->size); if (count == 0) {
return;
}
assert(count <= buf->size);
buf->read_ptr += count; buf->read_ptr += count;
if (buf->read_ptr >= buf->end_ptr) { if (buf->read_ptr >= buf->end_ptr) {

18
test/functional/api/server_requests_spec.lua
View File

@ -363,6 +363,24 @@ describe('server -> client', function()
server:close() server:close()
client:close() client:close()
end) end)
it('via stdio, with many small flushes does not crash #23781', function()
source([[
let chan = jobstart([v:progpath, '--embed', '--headless', '-n', '-u', 'NONE', '-i', 'NONE'], { 'rpc':v:false })
call chansend(chan, 0Z94)
sleep 50m
call chansend(chan, 0Z00)
call chansend(chan, 0Z01)
call chansend(chan, 0ZAC)
call chansend(chan, 0Z6E76696D5F636F6D6D616E64)
call chansend(chan, 0Z91)
call chansend(chan, 0ZA5)
call chansend(chan, 0Z71616C6C21)
let g:statuses = jobwait([chan])
]])
eq(eval('g:statuses'), { 0 })
assert_alive()
end)
end) end)
describe('connecting to its own pipe address', function() describe('connecting to its own pipe address', function()