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

net.websocket.frames: Read buffer length correctly in Lua 5.1 (fix #1598)

Browse source 
COMPAT: The __len metamethod does not work with tables in Lua 5.1.

Both strings and util.dbuffer now expose their length as a :len()
method.
This commit is contained in:
Kim Alvefur 2020-10-12 20:21:18 +02:00
parent d3b3e21720
commit fb63187afc
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/websocket/frames.lua
View file

@ -76,7 +76,7 @@ if s_unpack then
end
local function parse_frame_header(frame)
if #frame < 2 then return; end
if frame:len() < 2 then return; end
local byte1, byte2 = frame:byte(1, 2);
local result = {
@ -98,7 +98,7 @@ local function parse_frame_header(frame)
end
local header_length = 2 + length_bytes + (result.MASK and 4 or 0);
if #frame < header_length then return; end
if frame:len() < header_length then return; end
if length_bytes == 2 then
result.length = read_uint16be(frame, 3);
@ -141,7 +141,7 @@ end
local function parse_frame(frame)
local result, pos = parse_frame_header(frame);
if result == nil or #frame < (pos + result.length) then return nil, nil, result; end
if result == nil or frame:len() < (pos + result.length) then return nil, nil, result; end
result.data = parse_frame_body(frame, result, pos+1);
return result, pos + result.length;
end