fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2675 from cboylan/userInfoUpdate-guards 

Check for valid session in handleUserInfoUpdate
This commit is contained in:
John McLear 2015-06-25 01:31:07 +01:00
parent 444634b588 1060595676
commit 85d44c8a4e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/node/handler/PadMessageHandler.js
View File

@ -544,14 +544,22 @@ function handleUserInfoUpdate(client, message)
return;
}
// Check that we have a valid session and author to update.
var session = sessioninfos[client.id];
if(!session || !session.author || !session.padId)
{
messageLogger.warn("Dropped message, USERINFO_UPDATE Session not ready." + message.data);
return;
}
//Find out the author name of this session
var author = sessioninfos[client.id].author;
var author = session.author;
//Tell the authorManager about the new attributes
authorManager.setAuthorColorId(author, message.data.userInfo.colorId);
authorManager.setAuthorName(author, message.data.userInfo.name);
var padId = sessioninfos[client.id].padId;
var padId = session.padId;
var infoMsg = {
type: "COLLABROOM",