mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
MM-23254: Add nil checks to WebSocketEventFromJson (#14050)
Automatic Merge
This commit is contained in:
@@ -31,6 +31,9 @@ func (a *App) registerAllClusterMessageHandlers() {
|
||||
|
||||
func (a *App) clusterPublishHandler(msg *model.ClusterMessage) {
|
||||
event := model.WebSocketEventFromJson(strings.NewReader(msg.Data))
|
||||
if event == nil {
|
||||
return
|
||||
}
|
||||
a.PublishSkipClusterSend(event)
|
||||
}
|
||||
|
||||
|
||||
@@ -128,6 +128,9 @@ func (wsc *WebSocketClient) Listen() {
|
||||
}
|
||||
|
||||
event := WebSocketEventFromJson(bytes.NewReader(rawMsg))
|
||||
if event == nil {
|
||||
continue
|
||||
}
|
||||
if event.IsValid() {
|
||||
wsc.EventChannel <- event
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user