mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.dbuffer: Fix bugs, remove multi-char support (more complex than first thought)

Browse source 
Character sequences could be split across chunk boundaries. Would require a bunch
of code to make that work reliably.

Only apply front_consumed on first chunk, and adjust buffer_pos accordingly.
This commit is contained in:
Matthew Wild 2021-06-29 14:25:57 +01:00
parent 4e56658eb3
commit e21e4b2b24
2 changed files with 3 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/dbuffer.lua
View file

@ -80,12 +80,12 @@ end
function dbuffer_methods:read_until(char)
local buffer_pos = 0;
for i, chunk in self.items:items() do
local start = 1 + self.front_consumed;
local start = 1 + ((i == 1) and self.front_consumed or 0);
local char_pos = chunk:find(char, start, true);
if char_pos then
return self:read(buffer_pos + (char_pos - start) + #char);
return self:read(1 + buffer_pos + char_pos - start);
end
buffer_pos = buffer_pos + #chunk;
buffer_pos = buffer_pos + #chunk - (start - 1);
end
return nil;
end