diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-06-19 12:05:00 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-06-19 19:05:23 +0000 |
commit | 08a318a4dfb6c2f907c15c3574ef547403d1dec5 (patch) | |
tree | 5d5d92e76653d90b9e1145f71bb697fe6b32d1d7 /epan/dissectors | |
parent | 46ecf18fbdb6f02b1748ca72bd5e6ecf0e6c0886 (diff) |
Those address_to_str() calls were in packet scope, and were safe.
Change-Id: Ic727eca800a1b8972cf1a09cf2cf4ef8cfe4d0ba
Reviewed-on: https://code.wireshark.org/review/2439
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-hpteam.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rtcp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index 8ce21effed..219e5cb0f2 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -91,7 +91,7 @@ dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP NIC Team"); col_add_fstr(pinfo->cinfo, COL_INFO, "HP NIC Teaming Heartbeat; Port MAC = %s", - ep_address_to_str(&pinfo->dl_src)); + address_to_str(wmem_packet_scope(), &pinfo->dl_src)); if (tree) { /* we are being asked for details */ proto_item *hpteam_item; diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index dc8773c3e0..ab62369284 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -2850,7 +2850,7 @@ static void add_roundtrip_delay_info(tvbuff_t *tvb, packet_info *pinfo, proto_tr /* Report delay in INFO column */ col_append_fstr(pinfo->cinfo, COL_INFO, " (roundtrip delay <-> %s = %dms, using frame %u) ", - ep_address_to_str(&pinfo->net_src), delay, frame); + address_to_str(wmem_packet_scope(), &pinfo->net_src), delay, frame); } static int |