[svn-commits] crichter: trunk r44843 - in /trunk: ./ channels/chan_misdn.c

[svn-commits at lists.digium.com]

Author: crichter
Date: Wed Oct 11 03:45:40 2006
New Revision: 44843

URL: http://svn.digium.com/view/asterisk?rev=44843&view=rev
Log:
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
........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c

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

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?rev=44843&r1=44842&r2=44843&view=diff
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Wed Oct 11 03:45:40 2006
@@ -3170,7 +3170,7 @@
 {
 	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);