[asterisk-commits] qwell: branch 1.6.0 r114122 - in /branches/1.6.0: ./ channels/chan_h323.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Apr 14 13:34:37 2008
New Revision: 114122

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114122
Log:
Merged revisions 114121 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114121 | qwell | 2008-04-14 13:34:17 -0500 (Mon, 14 Apr 2008) | 15 lines

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

........
r114120 | qwell | 2008-04-14 13:31:57 -0500 (Mon, 14 Apr 2008) | 7 lines

The call_token on the pvt can occasionally be NULL, causing a crash.

If it is NULL, we can skip this channel, since it can't the one we're looking for.

(closes issue #9299)
Reported by: vazir

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_h323.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_h323.c?view=diff&rev=114122&r1=114121&r2=114122
==============================================================================
--- branches/1.6.0/channels/chan_h323.c (original)
+++ branches/1.6.0/channels/chan_h323.c Mon Apr 14 13:34:37 2008
@@ -1151,7 +1151,7 @@
 	while(pvt) {
 		if (!pvt->needdestroy && ((signed int)pvt->cd.call_reference == call_reference)) {
 			/* Found the call */
-			if ((token != NULL) && (!strcmp(pvt->cd.call_token, token))) {
+			if ((token != NULL) && (pvt->cd.call_token != NULL) && (!strcmp(pvt->cd.call_token, token))) {
 				ast_mutex_lock(&pvt->lock);
 				ast_mutex_unlock(&iflock);
 				return pvt;