mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 08:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

do not crash when encountering mismatched compositions. log the changesets and padid

Browse source
This commit is contained in:
webzwo0i 2015-02-26 14:57:49 +01:00
parent 38a4f1be5f
commit 7719117e1e
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1629,11 +1629,15 @@ function composePadChangesets(padId, startNum, endNum, callback)
changeset = changesets[startNum]; changeset = changesets[startNum];
var pool = pad.apool(); var pool = pad.apool();
for(var r=startNum+1;r<endNum;r++) try {
{ for(var r=startNum+1;r<endNum;r++) {
var cs = changesets[r]; var cs = changesets[r];
changeset = Changeset.compose(changeset, cs, pool); changeset = Changeset.compose(changeset, cs, pool);
} }
} catch(e){
console.warn("failed to compose cs in pad:",padId);
return;
}
callback(null); callback(null);
} }

2
src/static/js/Changeset.js
View file

@ -1318,7 +1318,7 @@ exports.compose = function (cs1, cs2, pool) {
var unpacked2 = exports.unpack(cs2); var unpacked2 = exports.unpack(cs2);
var len1 = unpacked1.oldLen; var len1 = unpacked1.oldLen;
var len2 = unpacked1.newLen; var len2 = unpacked1.newLen;
exports.assert(len2 == unpacked2.oldLen, "mismatched composition of two changesets"); exports.assert(len2 == unpacked2.oldLen, "mismatched composition of two changesets - cs1:",cs1," and cs2:",cs2);
var len3 = unpacked2.newLen; var len3 = unpacked2.newLen;
var bankIter1 = exports.stringIterator(unpacked1.charBank); var bankIter1 = exports.stringIterator(unpacked1.charBank);
var bankIter2 = exports.stringIterator(unpacked2.charBank); var bankIter2 = exports.stringIterator(unpacked2.charBank);