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

Merge pull request #1565 from ether/dont-crash-on-mismatch 

patch documented here https://github.com/ether/etherpad-lite/issues/472 ...
This commit is contained in:
John McLear 2013-02-27 08:20:46 -08:00
parent 3986835f58 ebd8b85072
commit 22bfe78c4f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,7 +586,14 @@ function handleUserChanges(client, message)
// client) are relative to revision r - 1. The follow function
// rebases "changeset" so that it is relative to revision r
// and can be applied after "c".
changeset = Changeset.follow(c, changeset, false, apool);
try
{
changeset = Changeset.follow(c, changeset, false, apool);
}catch(e){
console.warn("Can't apply USER_CHANGES "+changeset+", possibly because of mismatched follow error");
client.json.send({disconnect:"badChangeset"});
return;
}
if ((r - baseRev) % 200 == 0) { // don't let the stack get too deep
async.nextTick(callback);