aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-14 11:35:52 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-14 11:35:52 +0000
commitdc95f3f280a837dfbfe2b75507584b5f9ac005b0 (patch)
tree02ee46f14614dff52f3ddf2d134be46f41c87ed4 /channels
parente0c6de027a0adc67b71d7fc820035dbdb21f2563 (diff)
Merged revisions 148754 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r148754 | kpfleming | 2008-10-14 13:31:40 +0200 (Tue, 14 Oct 2008) | 2 lines fix some references to the owner of a private structure that may not be present ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@148763 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2fda99ca0..01e89907e 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18422,7 +18422,7 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req)
/* Get RTCP quality before end of call */
if (p->do_history || p->owner) {
- struct ast_channel *bridge = ast_bridged_channel(p->owner);
+ struct ast_channel *bridge = p->owner ? ast_bridged_channel(p->owner) : NULL;
char *videoqos, *textqos;
if (p->rtp) {
@@ -18443,7 +18443,9 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req)
append_history(p, "RTCPaudioRTT", "Quality:%s", audioqos_rtt);
}
- ast_rtp_set_vars(p->owner, p->rtp);
+ if (p->owner) {
+ ast_rtp_set_vars(p->owner, p->rtp);
+ }
}
if (bridge) {