From a56d2fe028628b8b7759ca02dceba6b8baebdade Mon Sep 17 00:00:00 2001
From: root <root@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 21 Mar 2006 19:06:07 +0000
Subject: automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@13999 f38db490-d61c-443f-a65b-d21fe96a405b
---
 res/res_features.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/res_features.c b/res/res_features.c
index bf23129ae..bf248b5f4 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -362,7 +362,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>")
-- 
cgit v1.2.3