NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Catch errors during preparation of client vars

Browse source 
... and disconnect the user
This commit is contained in:
Marcel Klehr 2013-10-10 16:38:41 +02:00
parent ccf4683558
commit 6689a3c02e
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/node/handler/PadMessageHandler.js
View file

@ -1006,11 +1006,17 @@ function handleClientReady(client, message)
//This is a normal first connect //This is a normal first connect
else else
{ {
//prepare all values for the wire //prepare all values for the wire, there'S a chance that this throws, if the pad is corrupted
try {
var atext = Changeset.cloneAText(pad.atext); var atext = Changeset.cloneAText(pad.atext);
var attribsForWire = Changeset.prepareForWire(atext.attribs, pad.pool); var attribsForWire = Changeset.prepareForWire(atext.attribs, pad.pool);
var apool = attribsForWire.pool.toJsonable(); var apool = attribsForWire.pool.toJsonable();
atext.attribs = attribsForWire.translated; atext.attribs = attribsForWire.translated;
}catch(e) {
console.error(e.stack || e)
client.json.send({disconnect:"padCorrupted"});// pull the breaks
return callback();
}
// Warning: never ever send padIds.padId to the client. If the // Warning: never ever send padIds.padId to the client. If the
// client is read only you would open a security hole 1 swedish // client is read only you would open a security hole 1 swedish