Skip to content

Fix possibility for nil access in sendloop #486

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

Merged
merged 1 commit into from
Feb 8, 2022
Merged

Fix possibility for nil access in sendloop #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions internal/apiserver/http_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ func TestTLSServerSelfSignedWithClientAuth(t *testing.T) {
pem.Encode(publicKeyFile, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})

// Start up a listener configured for TLS Mutual auth
config.Reset() // ensure APIShutdownTimeout cleared from earlier tests
cp := config.NewPluginConfig("ut")
initHTTPConfPrefx(cp, 0)
cp.Set(HTTPConfAddress, "127.0.0.1")
Expand Down
4 changes: 2 additions & 2 deletions pkg/wsclient/wsclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,13 +324,13 @@ func (w *wsClient) receiveReconnectLoop() {
// Synchronously invoke the reader, as it's important we react immediately to any error there.
w.readLoop()
close(receiverDone)
<-w.sendDone

// Ensure the connection is closed after the receiver exits
// Ensure the connection is closed after the sender and receivers exit
err = w.wsconn.Close()
if err != nil {
l.Debugf("WS %s close failed: %s", w.url, err)
}
<-w.sendDone
w.sendDone = nil
w.wsconn = nil
}
Expand Down