iowatcher: Add bounds checking in find_step

[blktrace.git] / iowatcher / main.c

diff --git a/iowatcher/main.c b/iowatcher/main.c
index 827f57d861155430971959eb3ab9fef542a6efdf..d23e3b25f03d73d5045b10c767a4bb93c79a5e94 100644 (file)
--- a/iowatcher/main.c
+++ b/iowatcher/main.c
@@ -12,7 +12,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  *  Parts of this file were imported from Jens Axboe's blktrace sources (also GPL)
  */
@@ -747,7 +747,8 @@ static void plot_io(struct plot *plot, int min_seconds, int max_seconds, u64 min
                if (!tf->label)
                        label[0] = 0;
                else {
-                       strcpy(label, tf->label);
+                       strncpy(label, tf->label, 255);
+                       label[255] = 0;
                        if (io_per_process)
                                strcat(label, " ");
                }
@@ -775,7 +776,8 @@ static void plot_io(struct plot *plot, int min_seconds, int max_seconds, u64 min
        close_plot(plot);
 }
 
-static void plot_tput(struct plot *plot, int min_seconds, int max_seconds)
+static void plot_tput(struct plot *plot, int min_seconds, int max_seconds,
+                     int with_legend)
 {
        struct trace_file *tf;
        char *units;
@@ -785,7 +787,8 @@ static void plot_tput(struct plot *plot, int min_seconds, int max_seconds)
        if (active_graphs[TPUT_GRAPH_INDEX] == 0)
                return;
 
-       svg_alloc_legend(plot, num_traces * 2);
+       if (with_legend)
+               svg_alloc_legend(plot, num_traces * 2);
 
        list_for_each_entry(tf, &all_traces, list) {
                if (tf->tput_writes_gld->max > max)
@@ -814,18 +817,22 @@ static void plot_tput(struct plot *plot, int min_seconds, int max_seconds)
        list_for_each_entry(tf, &all_traces, list) {
                if (tf->tput_writes_gld->max > 0) {
                        svg_line_graph(plot, tf->tput_writes_gld, tf->writes_color, 0, 0);
-                       svg_add_legend(plot, tf->label, "Writes", tf->writes_color);
+                       if (with_legend)
+                               svg_add_legend(plot, tf->label, "Writes", tf->writes_color);
                }
                if (tf->tput_reads_gld->max > 0) {
                        svg_line_graph(plot, tf->tput_reads_gld, tf->reads_color, 0, 0);
-                       svg_add_legend(plot, tf->label, "Reads", tf->reads_color);
+                       if (with_legend)
+                               svg_add_legend(plot, tf->label, "Reads", tf->reads_color);
                }
        }
 
        if (plot->add_xlabel)
                set_xlabel(plot, "Time (seconds)");
 
-       svg_write_legend(plot);
+       if (with_legend)
+               svg_write_legend(plot);
+
        close_plot(plot);
        total_graphs_written++;
 }
@@ -1111,8 +1118,7 @@ static void plot_io_movie(struct plot *plot)
                        set_graph_size(cols / graph_width_factor, rows / 8);
                        plot->timeline = i / graph_width_factor;
 
-                       plot_tput(plot, tf->min_seconds,
-                                 tf->max_seconds);
+                       plot_tput(plot, tf->min_seconds, tf->max_seconds, 0);
 
                        plot_cpu(plot, tf->max_seconds,
                                   "CPU System Time", CPU_SYS_GRAPH_INDEX, MPSTAT_SYS);
@@ -1705,7 +1711,7 @@ int main(int ac, char **av)
                num_yticks--;
 
        check_plot_columns(plot, TPUT_GRAPH_INDEX);
-       plot_tput(plot, min_seconds, max_seconds);
+       plot_tput(plot, min_seconds, max_seconds, 1);
 
        check_plot_columns(plot, FIO_GRAPH_INDEX);
        plot_fio_tput(plot, min_seconds, max_seconds);