summaryrefslogtreecommitdiff
path: root/ui/tap-sequence-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/tap-sequence-analysis.c
parent8df2857bc1082797cc7052eb5a6ebb45ac92e4b9 (diff)
downloadwireshark-ef929dc8eb8c61d5829132d2da2a3061df44bba9.tar.gz
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/tap-sequence-analysis.c')
-rw-r--r--ui/tap-sequence-analysis.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c
index e419f4c9be..84f2a0f228 100644
--- a/ui/tap-sequence-analysis.c
+++ b/ui/tap-sequence-analysis.c
@@ -299,8 +299,8 @@ static void sequence_analysis_item_free(gpointer data)
g_free(seq_item->time_str);
g_free(seq_item->comment);
g_free(seq_item->protocol);
- free_address(&seq_item->src_addr);
- free_address(&seq_item->dst_addr);
+ g_free((void *)seq_item->src_addr.data);
+ g_free((void *)seq_item->dst_addr.data);
g_free(data);
}
@@ -360,7 +360,10 @@ sequence_analysis_list_free(seq_analysis_info_t *sainfo)
sainfo->nconv = 0;
for (i=0; i<MAX_NUM_NODES; i++) {
- free_address(&sainfo->nodes[i]);
+ sainfo->nodes[i].type = AT_NONE;
+ sainfo->nodes[i].len = 0;
+ g_free((void *)sainfo->nodes[i].data);
+ sainfo->nodes[i].data = NULL;
}
sainfo->num_nodes = 0;
}