diff options
| author | Kim Alvefur <zash@zash.se> | 2020-10-12 21:29:20 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-10-12 21:29:20 +0200 |
| commit | b0393fe9e1c0a46319cff8de8bb05d7b5dbcff3b (patch) | |
| tree | e4d006dc4649263aa45d6fb1ce4103abfc20a1e3 | |
| parent | b4af560c9711221a4da3da41c8cef1d302b63beb (diff) | |
| parent | fb63187afceb8339b6142cc0b96162eb1c9af3b8 (diff) | |
| download | prosody-b0393fe9e1c0a46319cff8de8bb05d7b5dbcff3b.tar.gz prosody-b0393fe9e1c0a46319cff8de8bb05d7b5dbcff3b.zip | |
Merge 0.11->trunk
| -rw-r--r-- | net/websocket/frames.lua | 6 | ||||
| -rw-r--r-- | spec/util_dbuffer_spec.lua | 1 | ||||
| -rw-r--r-- | util/dbuffer.lua | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/net/websocket/frames.lua b/net/websocket/frames.lua index a0f3bd89..922a2fce 100644 --- a/net/websocket/frames.lua +++ b/net/websocket/frames.lua @@ -75,7 +75,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 = { @@ -97,7 +97,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); @@ -140,7 +140,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 diff --git a/spec/util_dbuffer_spec.lua b/spec/util_dbuffer_spec.lua index af404042..2b1af835 100644 --- a/spec/util_dbuffer_spec.lua +++ b/spec/util_dbuffer_spec.lua @@ -42,6 +42,7 @@ describe("util.dbuffer", function () assert.truthy(b:write("hello world")); assert.truthy(b:discard(6)); assert.equal(5, b:length()); + assert.equal(5, b:len()); assert.equal("world", b:read(5)); end); end); diff --git a/util/dbuffer.lua b/util/dbuffer.lua index a50f3a64..9d58b306 100644 --- a/util/dbuffer.lua +++ b/util/dbuffer.lua @@ -135,6 +135,7 @@ end function dbuffer_methods:length() return self._length; end +dbuffer_methods.len = dbuffer_methods.length; -- strings have :len() dynamic_buffer_mt.__len = dbuffer_methods.length; -- support # operator function dbuffer_methods:collapse(bytes) |