summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2015-08-14 15:46:05 -0500
committerMark Michelson <mmichelson@digium.com>2015-08-14 15:46:05 -0500
commitb719f56c72c9cc66879eeef11de2ef4498cba648 (patch)
tree33500850a52ee88fe813d37fa6262852987d9a1d /res
parentcea5dc7b8afd0e8cbde4c5d253bac3219125b168 (diff)
res_pjsip_sdp_rtp: Restore removed NULL check.
When sending an RTP keepalive, we need to be sure we're not dealing with a NULL RTP instance. There had been a NULL check, but the commit that added the rtp_timeout and rtp_hold_timeout options removed the NULL check. Change-Id: I2d7dcd5022697cfc6bf3d9e19245419078e79b64
Diffstat (limited to 'res')
-rw-r--r--res/res_pjsip_sdp_rtp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index d8605258f..0a5cbcbf9 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -115,6 +115,10 @@ static int send_keepalive(const void *data)
time_t interval;
int send_keepalive;
+ if (!rtp) {
+ return 0;
+ }
+
keepalive = ast_rtp_instance_get_keepalive(rtp);
if (!ast_sockaddr_isnull(&session_media->direct_media_addr)) {