aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rtp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2013-11-12 22:04:03 +0000
committerMichael Mann <mmann78@netscape.net>2013-11-12 22:04:03 +0000
commit7221215cdca74a587615e4e1ab9d79540bf58043 (patch)
tree89c8a8c9deae381fa127f3d18003f15b64d07e1e /epan/dissectors/packet-rtp.c
parent99f0fc1d27a64efe3dcaf6e012cf8dd5940a71be (diff)
Add "rtp handle protection" inside srtp_add_address/rtp_add_address/bluetooth_add_address so dissectors calling it don't need to find "rtp" just for the handle check.
svn path=/trunk/; revision=53288
Diffstat (limited to 'epan/dissectors/packet-rtp.c')
-rw-r--r--epan/dissectors/packet-rtp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index e8adf5d89c..59cbae33f2 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -829,7 +829,7 @@ bluetooth_add_address(packet_info *pinfo, address *addr,
* we've already done this work, so we don't need to do it
* again.
*/
- if (pinfo->fd->flags.visited)
+ if ((pinfo->fd->flags.visited) || (rtp_handle == NULL))
{
return;
}
@@ -913,7 +913,7 @@ srtp_add_address(packet_info *pinfo, address *addr, int port, int other_port,
* we've already done this work, so we don't need to do it
* again.
*/
- if (pinfo->fd->flags.visited)
+ if ((pinfo->fd->flags.visited) || (rtp_handle == NULL))
{
return;
}