From 173545a6275189f7947e4473cf4dae0de74e1639 Mon Sep 17 00:00:00 2001 From: Andrew Price Date: Wed, 6 Nov 2013 16:11:18 +0000 Subject: [PATCH] iowatcher: Add bounds checking in find_step Check the value of cur_mini_step is sane before using it as an index to mini_step array. Signed-off-by: Andrew Price --- iowatcher/plot.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/iowatcher/plot.c b/iowatcher/plot.c index 971a253..d486f29 100644 --- a/iowatcher/plot.c +++ b/iowatcher/plot.c @@ -530,10 +530,12 @@ static double find_step(double first, double last, int num_ticks) /* Round to power of 10 */ step = exp(floor(log(step) / log10) * log10); /* Scale down step to provide enough ticks */ - while ((last - first) / (step * mini_step[cur_mini_step]) > num_ticks - && cur_mini_step < TICK_MINI_STEPS) + while (cur_mini_step < TICK_MINI_STEPS + && (last - first) / (step * mini_step[cur_mini_step]) > num_ticks) cur_mini_step++; - step *= mini_step[cur_mini_step - 1]; + + if (cur_mini_step > 0) + step *= mini_step[cur_mini_step - 1]; return step; } -- 2.25.1