aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2010-06-10 18:43:46 -0400
committerSteven Rostedt <rostedt@goodmis.org>2010-06-10 18:43:46 -0400
commit70d7fbe0f8c4f6066b67823bbbca6291bd2a2f27 (patch)
treef7d82b42aedbd30df8bde0f76f60b654679f3178
parent3c95290d3fb593145b8ce1163d795a08f05e112c (diff)
kernelshark: Fix seting of clear task menu
The clear_task_menu was being updated by the set_menu_label() helper function. But that function expects a "comm" passed to it. The clear_task_menu may be updated when comm is NULL, and this would cause a strlen(comm) to crash the program. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--kernel-shark.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel-shark.c b/kernel-shark.c
index 9ca3942..5dde3dc 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -1435,8 +1435,8 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
1435 else 1435 else
1436 gtk_widget_set_sensitive(menu_filter_clear_tasks, FALSE); 1436 gtk_widget_set_sensitive(menu_filter_clear_tasks, FALSE);
1437 1437
1438 set_menu_label(menu_filter_clear_tasks, comm, pid, 1438 gtk_menu_item_set_label(GTK_MENU_ITEM(menu_filter_clear_tasks),
1439 "Clear Task Filter"); 1439 "Clear Task Filter");
1440 gtk_widget_hide(menu_filter_graph_clear_tasks); 1440 gtk_widget_hide(menu_filter_graph_clear_tasks);
1441 } else { 1441 } else {
1442 if (filter_task_count(ginfo->task_filter) || 1442 if (filter_task_count(ginfo->task_filter) ||
@@ -1451,8 +1451,8 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
1451 else 1451 else
1452 gtk_widget_set_sensitive(menu_filter_clear_tasks, FALSE); 1452 gtk_widget_set_sensitive(menu_filter_clear_tasks, FALSE);
1453 1453
1454 set_menu_label(menu_filter_clear_tasks, comm, pid, 1454 gtk_menu_item_set_label(GTK_MENU_ITEM(menu_filter_clear_tasks),
1455 "Clear List Task Filter"); 1455 "Clear List Task Filter");
1456 gtk_widget_show(menu_filter_graph_clear_tasks); 1456 gtk_widget_show(menu_filter_graph_clear_tasks);
1457 } 1457 }
1458 1458