aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ftp.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 /epan/dissectors/packet-ftp.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 'epan/dissectors/packet-ftp.c')
-rw-r--r--epan/dissectors/packet-ftp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index caa9c3147d..6487d2e9b1 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -545,7 +545,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
gboolean ftp_nat;
conversation_t *conversation;
- copy_address_shallow(&ftp_ip_address, &pinfo->src);
+ ftp_ip_address = pinfo->src;
if (pinfo->match_uint == pinfo->destport)
is_request = TRUE;