Skip to content

Fix race condition and a stack error caused by too old changesets #1025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcelklehr merged 3 commits into from
Sep 28, 2012
Merged

Fix race condition and a stack error caused by too old changesets #1025

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e16008b
Fix sessioninfos race that can cause crash during USER_CHANGES handling
amtep Sep 26, 2012
f1b4206
Fix crash when client submits changeset based on too-old revision
amtep Sep 26, 2012
7aaef01
Prettify session handling in handleUserChanges
amtep Sep 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/node/handler/PadMessageHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,14 +465,17 @@ function handleUserChanges(client, message)
var baseRev = message.data.baseRev;
var wireApool = (new AttributePool()).fromJsonable(message.data.apool);
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;

async.series([
//get the pad
function(callback)
{
padManager.getPad(sessioninfos[client.id].padId, function(err, value)
padManager.getPad(thisSession.padId, function(err, value)
{
if(ERR(err, callback)) return;
pad = value;
Expand Down Expand Up @@ -525,7 +528,11 @@ function handleUserChanges(client, message)
if(ERR(err, callback)) return;

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
Expand All @@ -545,9 +552,7 @@ function handleUserChanges(client, message)
return;
}

var thisAuthor = sessioninfos[client.id].author;

pad.appendRevision(changeset, thisAuthor);
pad.appendRevision(changeset, thisSession.author);

var correctionChangeset = _correctMarkersInPad(pad.atext, pad.pool);
if (correctionChangeset) {
Expand Down