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 /epan/dissectors/packet-uma.c | |
| parent | 8df2857bc1082797cc7052eb5a6ebb45ac92e4b9 (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 'epan/dissectors/packet-uma.c')
| -rw-r--r-- | epan/dissectors/packet-uma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 9822fe3811..87eb08c496 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1479,7 +1479,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) { break; } - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); set_address(&dst_addr, AT_IPv4, 4, &GPRS_user_data_ipv4_address); @@ -1511,7 +1511,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) { break; } - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); set_address(&dst_addr, AT_IPv4, 4, &unc_ipv4_address); @@ -1541,7 +1541,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) set_address(&src_addr, AT_IPv4, 4, &unc_ipv4_address); }else{ /* Set Source IP = own IP */ - copy_address_shallow(&src_addr, &pinfo->src); + src_addr = pinfo->src; } if((!pinfo->fd->flags.visited) && RTP_UDP_port!=0){ |