infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix race condition

pull/1/head
yflory 2021-04-08 16:37:26 +02:00
parent 6027123d12
commit 406d3cdd0e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/common/sframe-common-mailbox.js
View File

@ -217,11 +217,16 @@ define([
});
};
var historyState = false;
var onHistory = function () {};
mailbox.getMoreHistory = function (type, count, lastKnownHash, cb) {
if (type !== "broadcast" && historyState) { return void cb("ALREADY_CALLED"); }
historyState = true;
var onHistoryEnd;
mailbox.getMoreHistory = function (type, count, lastKnownHash, cb) {
if (type === "broadcast" && onHistoryEnd) {
onHistoryEnd.reg(cb);
return;
}
if (onHistoryEnd) { return void cb("ALREADY_CALLED"); }
onHistoryEnd = Util.mkEvent();
onHistoryEnd.reg(cb);
var txid = Util.uid();
execCommand('LOAD_HISTORY', {
type: type,
@ -237,8 +242,8 @@ define([
if (data.complete) {
onHistory = function () {};
var end = messages.length < count;
cb(null, messages, end);
historyState = false;
onHistoryEnd.fire(null, messages, end);
onHistoryEnd = undefined;
return;
}
if (data.hash !== lastKnownHash) {