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 /plugins/profinet/packet-dcom-cba-acco.c | |
| 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 'plugins/profinet/packet-dcom-cba-acco.c')
| -rw-r--r-- | plugins/profinet/packet-dcom-cba-acco.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 53ca996442..38356f0a8c 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -354,28 +354,28 @@ cba_build_color_filter(packet_info *pinfo) switch(GPOINTER_TO_UINT(profinet_type)) { case 1: return g_strdup_printf("(ip.src eq %s and ip.dst eq %s and cba.acco.dcom == 1) || (ip.src eq %s and ip.dst eq %s and cba.acco.dcom == 0)", - address_to_str(wmem_packet_scope(), &pinfo->net_dst), - address_to_str(wmem_packet_scope(), &pinfo->net_src), - 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_dst), + address_to_str(pinfo->pool, &pinfo->net_src), + address_to_str(pinfo->pool, &pinfo->net_src), + address_to_str(pinfo->pool, &pinfo->net_dst)); case 2: return g_strdup_printf("(ip.src eq %s and ip.dst eq %s and cba.acco.dcom == 1) || (ip.src eq %s and ip.dst eq %s and cba.acco.dcom == 0)", - address_to_str(wmem_packet_scope(), &pinfo->net_src), - address_to_str(wmem_packet_scope(), &pinfo->net_dst), - address_to_str(wmem_packet_scope(), &pinfo->net_dst), - address_to_str(wmem_packet_scope(), &pinfo->net_src)); + address_to_str(pinfo->pool, &pinfo->net_src), + address_to_str(pinfo->pool, &pinfo->net_dst), + address_to_str(pinfo->pool, &pinfo->net_dst), + address_to_str(pinfo->pool, &pinfo->net_src)); case 3: return g_strdup_printf("(ip.src eq %s and ip.dst eq %s and cba.acco.srt == 1) || (ip.src eq %s and ip.dst eq %s and cba.acco.srt == 0)", - address_to_str(wmem_packet_scope(), &pinfo->net_dst), - address_to_str(wmem_packet_scope(), &pinfo->net_src), - 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_dst), + address_to_str(pinfo->pool, &pinfo->net_src), + address_to_str(pinfo->pool, &pinfo->net_src), + address_to_str(pinfo->pool, &pinfo->net_dst)); case 4: return g_strdup_printf("(ip.src eq %s and ip.dst eq %s and cba.acco.srt == 1) || (ip.src eq %s and ip.dst eq %s and cba.acco.srt == 0)", - address_to_str(wmem_packet_scope(), &pinfo->net_src), - address_to_str(wmem_packet_scope(), &pinfo->net_dst), - address_to_str(wmem_packet_scope(), &pinfo->net_dst), - address_to_str(wmem_packet_scope(), &pinfo->net_src)); + address_to_str(pinfo->pool, &pinfo->net_src), + address_to_str(pinfo->pool, &pinfo->net_dst), + address_to_str(pinfo->pool, &pinfo->net_dst), + address_to_str(pinfo->pool, &pinfo->net_src)); default: return NULL; } |