summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2006-11-30 20:09:46 +0000
committerJoshua Colp <jcolp@digium.com>2006-11-30 20:09:46 +0000
commita77935b67423836448e4dea4ee66707640bd4e74 (patch)
tree196e3913cb53a5534d234b41f2e7ebc46d66061c /channels
parentd72171b6e47c1ddba89c0a5c4ae18e0ec5af07a5 (diff)
Merged revisions 48158 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r48158 | file | 2006-11-30 15:07:55 -0500 (Thu, 30 Nov 2006) | 10 lines Merged revisions 48157 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r48157 | file | 2006-11-30 15:06:43 -0500 (Thu, 30 Nov 2006) | 2 lines Only print out debug message if bridged channel is not NULL. (issue #8412 reported by jubilex) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 78bf747c5..ce7dac444 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6988,7 +6988,7 @@ retryowner:
if (!strcmp(ies.called_number, ast_parking_ext())) {
if (iax_park(ast_bridged_channel(iaxs[fr->callno]->owner), iaxs[fr->callno]->owner)) {
ast_log(LOG_WARNING, "Failed to park call on '%s'\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name);
- } else {
+ } else if (ast_bridged_channel(iaxs[fr->callno]->owner)) {
if (option_debug)
ast_log(LOG_DEBUG, "Parked call on '%s'\n", ast_bridged_channel(iaxs[fr->callno]->owner)->name);
}