Diff

net/websocket/frames.lua @ 11158:3a72cb126d6c

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 12 Oct 2020 21:29:20 +0200
parent 11114:6a608ecb3471
parent 11157:413bd21ba449
child 11166:51e5149ed0ad
line wrap: on
line diff
--- a/net/websocket/frames.lua	Mon Oct 12 18:27:42 2020 +0200
+++ b/net/websocket/frames.lua	Mon Oct 12 21:29:20 2020 +0200
@@ -75,7 +75,7 @@
 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 @@
 	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 @@
 
 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