Merged revisions 13961 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 21 Mar 2006 18:22:38 +0000 (18:22 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 21 Mar 2006 18:22:38 +0000 (18:22 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r13961 | russell | 2006-03-21 13:21:47 -0500 (Tue, 21 Mar 2006) | 3 lines

fix crash when using the ParkAndAnnounce application.  When using this application,
there will be no peer channel to play the parking announcement to. (issue #6756)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13962 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_features.c

index dab6376..7f2bdac 100644 (file)
@@ -339,7 +339,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
                "Timeout: %ld\r\n"
                "CallerID: %s\r\n"
                "CallerIDName: %s\r\n"
-               ,pu->parkingnum, pu->chan->name, peer->name
+               ,pu->parkingnum, pu->chan->name, peer ? peer->name : ""
                ,(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL)
                ,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
                ,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>")