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

Merge pull request #1025 from amtep/develop 

Fix race condition and a stack error caused by too old changesets
This commit is contained in:
Marcel Klehr 2012-09-28 05:43:47 -07:00
parent 49799bfa97 7aaef01346
commit 3578e36616
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,6 +465,9 @@ function handleUserChanges(client, message)
var baseRev = message.data.baseRev; var baseRev = message.data.baseRev;
var wireApool = (new AttributePool()).fromJsonable(message.data.apool); var wireApool = (new AttributePool()).fromJsonable(message.data.apool);
var changeset = message.data.changeset; var changeset = message.data.changeset;
// The client might disconnect between our callbacks. We should still
// finish processing the changeset, so keep a reference to the session.
var thisSession = sessioninfos[client.id];
var r, apool, pad; var r, apool, pad;
@ -472,7 +475,7 @@ function handleUserChanges(client, message)
//get the pad //get the pad
function(callback) function(callback)
{ {
padManager.getPad(sessioninfos[client.id].padId, function(err, value) padManager.getPad(thisSession.padId, function(err, value)
{ {
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
pad = value; pad = value;
@ -525,7 +528,11 @@ function handleUserChanges(client, message)
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
changeset = Changeset.follow(c, changeset, false, apool); changeset = Changeset.follow(c, changeset, false, apool);
callback(null); if ((r - baseRev) % 200 == 0) { // don't let the stack get too deep
async.nextTick(callback);
} else {
callback(null);
}
}); });
}, },
//use the callback of the series function //use the callback of the series function
@ -545,9 +552,7 @@ function handleUserChanges(client, message)
return; return;
} }
var thisAuthor = sessioninfos[client.id].author; pad.appendRevision(changeset, thisSession.author);
pad.appendRevision(changeset, thisAuthor);
var correctionChangeset = _correctMarkersInPad(pad.atext, pad.pool); var correctionChangeset = _correctMarkersInPad(pad.atext, pad.pool);
if (correctionChangeset) { if (correctionChangeset) {