diff options
| author | João Valverde <j@v6e.pt> | 2016-02-08 00:43:56 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-08 00:44:22 +0000 |
| commit | ef929dc8eb8c61d5829132d2da2a3061df44bba9 (patch) | |
| tree | 6dc7fb0abec832c1b336580bfeaec70717f0a76f /plugins/irda/packet-irda.c | |
| parent | 8df2857bc1082797cc7052eb5a6ebb45ac92e4b9 (diff) | |
| download | wireshark-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 'plugins/irda/packet-irda.c')
| -rw-r--r-- | plugins/irda/packet-irda.c | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 7975d1cbec..1e2d070ee6 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -529,9 +529,13 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r /* create conversation entry */ src = circuit_id ^ CMD_FRAME; - set_address(&srcaddr, AT_NONE, 1, &src); + srcaddr.type = AT_NONE; + srcaddr.len = 1; + srcaddr.data = (guint8*)&src; - set_address(&destaddr, AT_NONE, 1, &circuit_id); + destaddr.type = AT_NONE; + destaddr.len = 1; + destaddr.data = (guint8*)&circuit_id; conv = find_conversation(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); if (conv) @@ -678,9 +682,13 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro retcode = tvb_get_guint8(tvb, offset + 1); src = circuit_id ^ CMD_FRAME; - set_address(&srcaddr, AT_NONE, 1, &src); + srcaddr.type = AT_NONE; + srcaddr.len = 1; + srcaddr.data = (guint8*)&src; - set_address(&destaddr, AT_NONE, 1, &circuit_id); + destaddr.type = AT_NONE; + destaddr.len = 1; + destaddr.data = (guint8*)&circuit_id; /* Find result value dissector */ conv = find_conversation(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); @@ -959,9 +967,13 @@ static void dissect_appl_proto(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro src = circuit_id ^ CMD_FRAME; - set_address(&srcaddr, AT_NONE, 1, &src); + srcaddr.type = AT_NONE; + srcaddr.len = 1; + srcaddr.data = (guint8*)&src; - set_address(&destaddr, AT_NONE, 1, &circuit_id); + destaddr.type = AT_NONE; + destaddr.len = 1; + destaddr.data = (guint8*)&circuit_id; /* Find result value dissector */ conv = find_conversation(pinfo->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); @@ -1188,9 +1200,14 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec /*g_message("%d: add_lmp_conversation(%p, %d, %d, %p) = ", pinfo->num, pinfo, dlsap, ttp, proto_dissector); */ - set_address(&srcaddr, AT_NONE, 1, &circuit_id); - - set_address(&destaddr, AT_NONE, 1, &dest); + srcaddr.type = AT_NONE; + srcaddr.len = 1; + srcaddr.data = (guint8*)&circuit_id; + + dest = circuit_id ^ CMD_FRAME; + destaddr.type = AT_NONE; + destaddr.len = 1; + destaddr.data = (guint8*)&dest; conv = find_conversation(pinfo->num, &destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); if (conv) |