[svn-commits] trunk r13962 - in /trunk: ./ res/res_features.c

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Mar 21 12:22:38 2006
New Revision: 13962

URL: http://svn.digium.com/view/asterisk?rev=13962&view=rev
Log:
Merged revisions 13961 via svnmerge from 
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)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?rev=13962&r1=13961&r2=13962&view=diff
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue Mar 21 12:22:38 2006
@@ -339,7 +339,7 @@
 		"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>")