From f2742c5b63d62be5f6e6e677fed02f00b24d7981 Mon Sep 17 00:00:00 2001 From: mluto Date: Wed, 30 Jan 2013 15:21:25 +0100 Subject: [PATCH 1/2] Check for missing userInfo --- src/node/handler/PadMessageHandler.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 434c25ad..f4627913 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -473,6 +473,11 @@ function handleSuggestUserName(client, message) function handleUserInfoUpdate(client, message) { //check if all ok + if(message.data.userInfo == null) + { + messageLogger.warn("Dropped message, USERINFO_UPDATE Message has no userInfo!"); + return; + } if(message.data.userInfo.colorId == null) { messageLogger.warn("Dropped message, USERINFO_UPDATE Message has no colorId!"); From 7e48e025c7df00ec80924bc1afabc6a8459ea444 Mon Sep 17 00:00:00 2001 From: mluto Date: Wed, 30 Jan 2013 15:28:54 +0100 Subject: [PATCH 2/2] Check for missing payload on CLIENT_MESSAGE --- src/node/handler/PadMessageHandler.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index f4627913..8a1b8782 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -210,6 +210,7 @@ exports.handleMessage = function(client, message) } else if (message.data.type == "SAVE_REVISION") { handleSaveRevisionMessage(client, message); } else if (message.data.type == "CLIENT_MESSAGE" && + message.data.payload != null && message.data.payload.type == "suggestUserName") { handleSuggestUserName(client, message); } else {