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/reassemble.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/reassemble.c')
| -rw-r--r-- | epan/reassemble.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/reassemble.c b/epan/reassemble.c index 98aae61e0f..8049b26281 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -97,8 +97,8 @@ fragment_addresses_temporary_key(const packet_info *pinfo, const guint32 id, /* * Do a shallow copy of the addresses. */ - copy_address_shallow(&key->src, &pinfo->src); - copy_address_shallow(&key->dst, &pinfo->dst); + key->src = pinfo->src; + key->dst = pinfo->dst; key->id = id; return (gpointer)key; @@ -142,8 +142,8 @@ fragment_addresses_free_persistent_key(gpointer ptr) /* * Free up the copies of the addresses from the old key. */ - free_address(&key->src); - free_address(&key->dst); + g_free((gpointer)key->src.data); + g_free((gpointer)key->dst.data); g_slice_free(fragment_addresses_key, key); } @@ -231,8 +231,8 @@ fragment_addresses_ports_temporary_key(const packet_info *pinfo, const guint32 i /* * Do a shallow copy of the addresses. */ - copy_address_shallow(&key->src_addr, &pinfo->src); - copy_address_shallow(&key->dst_addr, &pinfo->dst); + key->src_addr = pinfo->src; + key->dst_addr = pinfo->dst; key->src_port = pinfo->srcport; key->dst_port = pinfo->destport; key->id = id; @@ -280,8 +280,8 @@ fragment_addresses_ports_free_persistent_key(gpointer ptr) /* * Free up the copies of the addresses from the old key. */ - free_address(&key->src_addr); - free_address(&key->dst_addr); + g_free((gpointer)key->src_addr.data); + g_free((gpointer)key->dst_addr.data); g_slice_free(fragment_addresses_ports_key, key); } |