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 /ui/cli | |
| 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 'ui/cli')
| -rw-r--r-- | ui/cli/tap-comparestat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index 286310103a..992666f443 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -119,8 +119,8 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const /* so this get filled, usually with the first frame */ if (cs->eth_dst.len == 0) { - copy_address_shallow(&cs->eth_dst, &pinfo->dl_dst); - copy_address_shallow(&cs->eth_src, &pinfo->dl_src); + cs->eth_dst = pinfo->dl_dst; + cs->eth_src = pinfo->dl_src; } /* Set up the fields of the pseudo-header and create checksum */ @@ -145,7 +145,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const fInfo->num = pinfo->num; fInfo->id = ci->ip_id; fInfo->ip_ttl = ci->ip_ttl; - copy_address_shallow(&fInfo->dl_dst, &pinfo->dl_dst); + fInfo->dl_dst = pinfo->dl_dst; fInfo->abs_ts = pinfo->abs_ts; /* clean memory */ nstime_set_zero(&fInfo->zebra_time); |