Skip to content

Commit 0d26be4

Browse files
committed
Update js/jquery.fn.gantt.js
Fixes deadlock (and chrome/IE/firefox) crash, because of applying floor to current date (variable doesn't increment).
1 parent ae8b8a4 commit 0d26be4

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

js/jquery.fn.gantt.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,17 +1525,20 @@
15251525
var end = new Date(to);
15261526
var ret = [];
15271527
var i = 0;
1528-
do {
1528+
for(;;) {
15291529
ret[i] = new Date(current.getTime());
15301530
current.setHours(current.getHours() + scaleStep);
1531+
1532+
// Check before applying floor, to avoid deadlocks.
1533+
if(current.getTime() > to.getTime()) break;
1534+
15311535
current.setHours(Math.floor((current.getHours()) / scaleStep) * scaleStep);
15321536

15331537
if (current.getDay() !== ret[i].getDay()) {
15341538
current.setHours(0);
15351539
}
1536-
15371540
i++;
1538-
} while (current.getTime() <= to.getTime());
1541+
};
15391542
return ret;
15401543
},
15411544

@@ -1707,4 +1710,4 @@
17071710
});
17081711

17091712
};
1710-
})(jQuery);
1713+
})(jQuery);

0 commit comments

Comments
 (0)