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/wimax | |
| 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/wimax')
| -rw-r--r-- | plugins/wimax/mac_hd_generic_decoder.c | 12 | ||||
| -rw-r--r-- | plugins/wimax/packet-wmx.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index b5fc149827..d2d644d94d 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -1069,15 +1069,15 @@ static int dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, first_gmh = FALSE; cid = cid_base + cid_adjust[cid_index] + cid_vernier[cid_index]; /* Save address pointers. */ - copy_address_shallow(&save_src, &pinfo->src); - copy_address_shallow(&save_dst, &pinfo->dst); + save_src = pinfo->src; + save_dst = pinfo->dst; /* Use dl_src and dl_dst in defragmentation. */ - copy_address_shallow(&pinfo->src, &pinfo->dl_src); - copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); + pinfo->src = pinfo->dl_src; + pinfo->dst = pinfo->dl_dst; payload_frag = fragment_add_seq(&payload_reassembly_table, tvb, offset, pinfo, cid, NULL, frag_number[cid_index], frag_len, ((frag_type==LAST_FRAG)?0:1), 0); /* Restore address pointers. */ - copy_address_shallow(&pinfo->src, &save_src); - copy_address_shallow(&pinfo->dst, &save_dst); + pinfo->src = save_src; + pinfo->dst = save_dst; if (frag_type == LAST_FRAG) { /* Make sure fragment_add_seq() sees next one as a new frame. */ diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c index c71dafc718..533257caa1 100644 --- a/plugins/wimax/packet-wmx.c +++ b/plugins/wimax/packet-wmx.c @@ -45,7 +45,7 @@ gint mac_sdu_length = 49; /* default SDU size is 49 bytes (11.13.16) */ extern guint global_cid_max_basic; extern gboolean include_cor2_changes; -address bs_address = ADDRESS_INIT_NONE; +address bs_address = {AT_NONE, 0, NULL}; static int hf_tlv_type = -1; |