diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-12-26 23:09:04 +0100 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-12-26 22:18:09 +0000 |
commit | a2beef95dba6fd3fabc1910a138e0c41e7177bda (patch) | |
tree | efd4791367b135eabb44407f99d54c17fafb1f2d /epan/dissectors | |
parent | ea6a5780c58d6c58f49512ae1844c340bf28dfb8 (diff) |
Fix assertion when applying conversation color
Packet scoped memory cannot be used here; let's use the pinfo pool
Change-Id: If76605f7a3021f5900fd46ce7d1c642a518c902f
Reviewed-on: https://code.wireshark.org/review/6061
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-eth.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ip.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-tcp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-udp.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 7c749517f5..04e855810d 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -170,8 +170,8 @@ static gchar* eth_build_color_filter(packet_info *pinfo) { return g_strdup_printf("eth.addr eq %s and eth.addr eq %s", - address_to_str(wmem_packet_scope(), &pinfo->dl_src), - address_to_str(wmem_packet_scope(), &pinfo->dl_dst)); + address_to_str(pinfo->pool, &pinfo->dl_src), + address_to_str(pinfo->pool, &pinfo->dl_dst)); } diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 93bfbe6ea8..cee5f1dce5 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -548,8 +548,8 @@ static gchar* ip_build_color_filter(packet_info *pinfo) { return g_strdup_printf("ip.addr eq %s and ip.addr eq %s", - address_to_str(wmem_packet_scope(), &pinfo->net_src), - address_to_str(wmem_packet_scope(), &pinfo->net_dst)); + address_to_str(pinfo->pool, &pinfo->net_src), + address_to_str(pinfo->pool, &pinfo->net_dst)); } /* diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 35fe0a4f97..c73ddaccb4 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -643,8 +643,8 @@ tcp_build_color_filter(packet_info *pinfo) if( pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4 ) { /* TCP over IPv4 */ return g_strdup_printf("(ip.addr eq %s and ip.addr eq %s) and (tcp.port eq %d and tcp.port eq %d)", - address_to_str(wmem_packet_scope(), &pinfo->net_src), - address_to_str(wmem_packet_scope(), &pinfo->net_dst), + address_to_str(pinfo->pool, &pinfo->net_src), + address_to_str(pinfo->pool, &pinfo->net_dst), pinfo->srcport, pinfo->destport ); } diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index c606cafaf4..254fd19bdc 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -389,8 +389,8 @@ udp_build_color_filter(packet_info *pinfo) if( pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4 ) { /* UDP over IPv4 */ return g_strdup_printf("(ip.addr eq %s and ip.addr eq %s) and (udp.port eq %d and udp.port eq %d)", - address_to_str(wmem_packet_scope(), &pinfo->net_src), - address_to_str(wmem_packet_scope(), &pinfo->net_dst), + address_to_str(pinfo->pool, &pinfo->net_src), + address_to_str(pinfo->pool, &pinfo->net_dst), pinfo->srcport, pinfo->destport ); } |