From d16ccb5cc1d32f086c257529681c02bff462e6b5 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 12 Oct 2020 20:20:02 +0200 Subject: util.dbuffer: Expose length as :len() method, like strings Ref #1598 --- spec/util_dbuffer_spec.lua | 1 + util/dbuffer.lua | 1 + 2 files changed, 2 insertions(+) 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) -- cgit v1.2.3 From 0e8366644db4f804a4ad2bf80959a6140da1b504 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 12 Oct 2020 20:21:18 +0200 Subject: net.websocket.frames: Read buffer length correctly in Lua 5.1 (fix #1598) 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. --- net/websocket/frames.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/websocket/frames.lua b/net/websocket/frames.lua index a0c0d4cd..9cb5f4fe 100644 --- a/net/websocket/frames.lua +++ b/net/websocket/frames.lua @@ -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 -- cgit v1.2.3