Fix issue #5029 (#5041)

- infinite loop in generating time axis, due to insufficient bounds checking.

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 4fe39b810828edca15d8daedf6bb5fc804a3c964..cfa9f829aa9e89ba92d46b5346f4286ce6a71925 100644 (file)
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -240,7 +240,7 @@ function determineStepSize(min, max, unit, capacity) {
        var i, ilen, factor;
 
        if (!steps) {
-               return Math.ceil(range / ((capacity || 1) * milliseconds));
+               return Math.ceil(range / (capacity * milliseconds));
        }
 
        for (i = 0, ilen = steps.length; i < ilen; ++i) {
@@ -748,7 +748,8 @@ module.exports = function(Chart) {
                        var tickLabelWidth = me.getLabelWidth(exampleLabel);
                        var innerWidth = me.isHorizontal() ? me.width : me.height;
 
-                       return Math.floor(innerWidth / tickLabelWidth);
+                       var capacity = Math.floor(innerWidth / tickLabelWidth);
+                       return capacity > 0 ? capacity : 1;
                }
        });