[asterisk-commits] crichter: branch 1.4 r44563 - in /branches/1.4: ./ channels/chan_misdn.c

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Fri Oct 6 05:53:41 MST 2006


Author: crichter
Date: Fri Oct  6 07:53:41 2006
New Revision: 44563

URL: http://svn.digium.com/view/asterisk?rev=44563&view=rev
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/channels/chan_misdn.c

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

Modified: branches/1.4/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_misdn.c?rev=44563&r1=44562&r2=44563&view=diff
==============================================================================
--- branches/1.4/channels/chan_misdn.c (original)
+++ branches/1.4/channels/chan_misdn.c Fri Oct  6 07:53:41 2006
@@ -3164,7 +3164,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);



More information about the asterisk-commits mailing list