Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid triggering a segfault due to a read/close race #25

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid triggering a segfault due to a read/close race #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
582d447
Avoid read/close race on the socket
matthewd Oct 6, 2016
e161305
Fix 'instance variable uninitialized' warning
matthewd Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/websocket-client-simple/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Client
attr_reader :url, :handshake

def connect(url, options={})
return if @socket
return if @socket ||= nil
@url = url
uri = URI.parse url
@socket = TCPSocket.new(uri.host,
Expand Down Expand Up @@ -84,11 +84,16 @@ def close
if !@pipe_broken
send nil, :type => :close
end

@closed = true
if @thread
Thread.kill @thread
Thread.pass while @thread.status
@thread = nil
end
@socket.close if @socket
@socket = nil
emit :__close
Thread.kill @thread if @thread
end

def open?
Expand Down