1 files changed, 17 insertions, 2 deletions

diff --git a/trace-graph.c b/trace-graph.c
index 04e2439..4e91fe8 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -326,6 +326,7 @@ static void update_label_time(GtkWidget *label, gint64 time)
         trace_seq_printf(&s, "%s%lu.%06lu", min, sec, usec);
 
         gtk_label_set_text(GTK_LABEL(label), s.buffer);
+        trace_seq_destroy(&s);
 }
 
 static void update_cursor(struct graph_info *ginfo)
@@ -1111,8 +1112,10 @@ int trace_graph_check_sched_switch(struct graph_info *ginfo,
 
         if (id == ginfo->ftrace_sched_switch_id) {
                 pevent_read_number_field(ginfo->ftrace_pid_field, record->data, &val);
-                if (comm)
+                if (comm && ginfo->ftrace_comm_field)
                         *comm = record->data + ginfo->ftrace_comm_field->offset;
+                else
+                        comm = NULL;
                 if (pid)
                         *pid = val;
                 goto out;
@@ -1223,6 +1226,7 @@ static void draw_plot_info(struct graph_info *ginfo, struct graph_plot *plot,
 
         if (!trace_graph_plot_display_info(ginfo, plot, &s, time)) {
                 /* Just display the current time */
+                trace_seq_destroy(&s);
                 trace_seq_init(&s);
                 trace_seq_printf(&s, "%lu.%06lu", sec, usec);
         }
@@ -1230,6 +1234,7 @@ static void draw_plot_info(struct graph_info *ginfo, struct graph_plot *plot,
         trace_seq_putc(&s, 0);
 
         draw_info_box(ginfo, s.buffer, x, y);
+        trace_seq_destroy(&s);
 }
 
 static void draw_latency(struct graph_info *ginfo, gint x, gint y)
@@ -1259,6 +1264,7 @@ static void draw_latency(struct graph_info *ginfo, gint x, gint y)
         trace_seq_printf(&s, "Diff: %s%ld.%06lu secs", neg ? "-":"", sec, usec);
 
         draw_info_box(ginfo, s.buffer, x, y);
+        trace_seq_destroy(&s);
 }
 
 static gboolean
@@ -1660,13 +1666,17 @@ static gint draw_event_label(struct graph_info *ginfo, gint i,
          */
         ret = trace_graph_plot_display_last_event(ginfo, plot, &s,
                                                   convert_x_to_time(ginfo, p2-1));
-        if (!ret)
+        if (!ret) {
+                trace_seq_destroy(&s);
                 return p2;
+        }
 
         layout = gtk_widget_create_pango_layout(ginfo->draw, s.buffer);
         pango_layout_set_font_description(layout, font);
         pango_layout_get_pixel_size(layout, &text_width, &text_height);
 
+        trace_seq_destroy(&s);
+
         /* Lets see if we can print this info */
         if (p2 < text_width)
                 start = 1;
@@ -1933,6 +1943,7 @@ static void draw_timeline(struct graph_info *ginfo, gint width)
         gdk_draw_layout(ginfo->curr_pixmap, ginfo->draw->style->black_gc,
                         1, height+10, layout);
         g_object_unref(layout);
+        trace_seq_destroy(&s);
 
 
         /* --- draw ending time --- */
@@ -1946,6 +1957,7 @@ static void draw_timeline(struct graph_info *ginfo, gint width)
         gdk_draw_layout(ginfo->curr_pixmap, ginfo->draw->style->black_gc,
                         width - (w + 2), height+10, layout);
         g_object_unref(layout);
+        trace_seq_destroy(&s);
 
 
         /* --- draw time at intervals --- */
@@ -1968,6 +1980,7 @@ static void draw_timeline(struct graph_info *ginfo, gint width)
                 gdk_draw_layout(ginfo->curr_pixmap, ginfo->draw->style->black_gc,
                                 mid - (w / 2), height+10, layout);
                 g_object_unref(layout);
+                trace_seq_destroy(&s);
         }
 }
 
@@ -2411,6 +2424,8 @@ static int load_handle(struct graph_info *ginfo,
 
                 free_record(record);
                 record = tracecmd_read_cpu_last(handle, cpu);
+                if (!record)
+                        continue;
 
                 if (record->ts > ginfo->end_time)
                         ginfo->end_time = record->ts;