From 59f24493ce9b224ea9d7679f3048ed18252bc5cb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 7 Sep 2013 11:59:29 -0400 Subject: [PATCH] detect invalid json with web socket messages --- .../ServerManager/WebSocketConnection.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs index 3612b85b95..4bab10ee09 100644 --- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs +++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs @@ -132,10 +132,17 @@ namespace MediaBrowser.Server.Implementations.ServerManager { LastActivityDate = DateTime.UtcNow; + if (!message.StartsWith("{", StringComparison.OrdinalIgnoreCase)) + { + _logger.Error("Received web socket message that is not a json structure: " + message); + return; + } + if (OnReceive == null) { return; } + try { var stub = (WebSocketMessage)_jsonSerializer.DeserializeFromString(message, typeof(WebSocketMessage));