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/packet-eth.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 'epan/dissectors/packet-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 4 |
1 files changed, 2 insertions, 2 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)); } |