[asterisk-commits] qwell: trunk r114121 - in /trunk: ./ channels/chan_h323.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Apr 14 13:34:17 2008
New Revision: 114121

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

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

Modified: trunk/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_h323.c?view=diff&rev=114121&r1=114120&r2=114121
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Mon Apr 14 13:34:17 2008
@@ -1148,7 +1148,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;