Skip to content

Commit 028e16b

Browse files
authored
Fix error messages for Frame (#22)
1 parent b12d51f commit 028e16b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/protocol/websocket/frame.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def self.read(finished, flags, opcode, stream, maximum_frame_size)
185185
end
186186

187187
if length > maximum_frame_size
188-
raise ProtocolError, "Invalid payload length: #{@length} > #{maximum_frame_size}!"
188+
raise ProtocolError, "Invalid payload length: #{length} > #{maximum_frame_size}!"
189189
end
190190

191191
if mask
@@ -195,7 +195,7 @@ def self.read(finished, flags, opcode, stream, maximum_frame_size)
195195
payload = stream.read(length) or raise EOFError, "Could not read payload!"
196196

197197
if payload.bytesize != length
198-
raise EOFError, "Incorrect payload length: #{@length} != #{payload.bytesize}!"
198+
raise EOFError, "Incorrect payload length: #{length} != #{payload.bytesize}!"
199199
end
200200

201201
return self.new(finished, payload, flags: flags, opcode: opcode, mask: mask)

test/protocol/websocket/frame.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@
6464

6565
expect do
6666
subject.read(false, 0, 0, stream, 124)
67-
end.to raise_exception(Protocol::WebSocket::ProtocolError, message: be =~ /Invalid payload length/)
67+
end.to raise_exception(Protocol::WebSocket::ProtocolError, message: be =~ /Invalid payload length: \d+ > \d*!/)
6868
end
6969

7070
it "rejects frames with truncated payload" do
7171
stream = StringIO.new("\x051234")
7272

7373
expect do
7474
subject.read(false, 0, 0, stream, 128)
75-
end.to raise_exception(EOFError, message: be =~ /Incorrect payload length/)
75+
end.to raise_exception(EOFError, message: be =~ /Incorrect payload length: \d+ != \d+!/)
7676
end
7777
end
7878

0 commit comments

Comments
 (0)