From: Christian Richter <christian.richter@beronet.com>
Date: Wed, 11 Oct 2006 08:45:40 +0000 (+0000)
Subject: Merged revisions 44563 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4449
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ff86b686fc5b5044296c903ed98ee29198072c8;p=thirdparty%2Fasterisk.git

Merged revisions 44563 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44563 | crichter | 2006-10-06 14:53:41 +0200 (Fr, 06 Okt 2006) | 9 lines

Merged revisions 44460 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44460 | crichter | 2006-10-05 12:02:38 +0200 (Do, 05 Okt 2006) | 1 line

fixed segfault which happens during hold/transfer action
........

................


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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 7778780897..a9c05babde 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -3170,7 +3170,7 @@ static struct chan_list *find_chan_by_pid(struct chan_list *list, int pid)
 {
 	struct chan_list *help=list;
 	for (;help; help=help->next) {
-		if (help->bc->pid == pid) return help;
+		if ( help->bc && (help->bc->pid == pid) ) return help;
 	}
   
 	chan_misdn_log(6, 0, "$$$ find_chan: No channel found for pid:%d\n",pid);