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

Merge pull request #2111 from ether/quickfix/req_cs-bounds-check 

Fix REQ_CS rev boundary check
This commit is contained in:
John McLear 2014-03-20 20:35:48 +00:00
parent ba38bc998e f6f319960d
commit dc1a33bead
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1372,7 +1372,7 @@ function getChangesetInfo(padId, startNum, endNum, granularity, callback)
while (compositeStart < endNum) while (compositeStart < endNum)
{ {
var compositeEnd = compositeStart + granularity; var compositeEnd = compositeStart + granularity;
if (compositeEnd > endNum || compositeEnd > head_revision) if (compositeEnd > endNum || compositeEnd > head_revision+1)
{ {
break; break;
} }
@ -1500,8 +1500,8 @@ function composePadChangesets(padId, startNum, endNum, callback)
var changesetsNeeded=[]; var changesetsNeeded=[];
var headNum = pad.getHeadRevisionNumber(); var headNum = pad.getHeadRevisionNumber();
if (endNum > headNum) if (endNum > headNum+1)
endNum = headNum; endNum = headNum+1;
if (startNum < 0) if (startNum < 0)
startNum = 0; startNum = 0;
//create a array for all changesets, we will //create a array for all changesets, we will