aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/graph_analysis.c
diff options
context:
space:
mode:
authorJoão Valverde <j@v6e.pt>2016-02-08 00:43:56 +0000
committerJoão Valverde <j@v6e.pt>2016-02-08 00:44:22 +0000
commitef929dc8eb8c61d5829132d2da2a3061df44bba9 (patch)
tree6dc7fb0abec832c1b336580bfeaec70717f0a76f /ui/gtk/graph_analysis.c
parent8df2857bc1082797cc7052eb5a6ebb45ac92e4b9 (diff)
Revert "Add free_address_wmem() and other extensions to address API"
This reverts commit 13ec77a9fc3af3b0b502820d0b55796c89997896. This commit introduces a segmentation fault for Lua code (uncovered by the test suite). Change-Id: Ibc273d1915cda9632697b9f138f0ae104d3fb65e Reviewed-on: https://code.wireshark.org/review/13813 Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ui/gtk/graph_analysis.c')
-rw-r--r--ui/gtk/graph_analysis.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index d6351f6d6b..b8b78cb816 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -86,7 +86,10 @@ static void graph_analysis_reset(graph_analysis_data_t *user_data)
user_data->graph_info->num_nodes = 0;
user_data->num_items = 0;
for (i=0; i<MAX_NUM_NODES; i++) {
- free_address(&user_data->graph_info->nodes[i]);
+ user_data->graph_info->nodes[i].type = AT_NONE;
+ user_data->graph_info->nodes[i].len = 0;
+ g_free((void *)user_data->graph_info->nodes[i].data);
+ user_data->graph_info->nodes[i].data = NULL;
}
user_data->dlg.first_node = 0;
@@ -154,7 +157,10 @@ static void on_destroy(GtkWidget *win _U_, graph_analysis_data_t *user_data)
int i;
for (i=0; i<MAX_NUM_NODES; i++) {
- free_address(&user_data->graph_info->nodes[i]);
+ user_data->graph_info->nodes[i].type = AT_NONE;
+ user_data->graph_info->nodes[i].len = 0;
+ g_free((void *)user_data->graph_info->nodes[i].data);
+ user_data->graph_info->nodes[i].data = NULL;
}
user_data->dlg.window = NULL;
g_free(user_data->dlg.title);