mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-03 20:38:59 +00:00 
			
		
		
		
	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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		@@ -1151,7 +1151,7 @@ static struct oh323_pvt *find_call_locked(int call_reference, const char *token)
 | 
			
		||||
	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;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user