Merged revisions 48158 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 30 Nov 2006 20:09:46 +0000 (20:09 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 30 Nov 2006 20:09:46 +0000 (20:09 +0000)
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

channels/chan_iax2.c

index 78bf747..ce7dac4 100644 (file)
@@ -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);
                                                }