From: Steve Murphy <murf@digium.com>
Date: Fri, 17 Oct 2008 17:18:31 +0000 (+0000)
Subject: Interesting crash. In this case, you exit the
X-Git-Tag: 1.4.23-rc1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f30902385c801deaa013fddd8090c89ac27339b;p=thirdparty%2Fasterisk.git

Interesting crash. In this case, you exit the
bridge with peer completely GONE.

I moved the channel find call up to cover the
whole peer CDR reset code segment. This appears
to solve the crash without changing the logic
at all.




git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@150637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_features.c b/res/res_features.c
index 6b5bc6b18f..57a309ad88 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1812,9 +1812,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 		} else {
 			ast_cdr_specialized_reset(chan_cdr,0); /* nothing changed, reset the chan_cdr  */
 		}
-		if (strcasecmp(orig_peername, peer->name) != 0) { 
+		chan_ptr = ast_get_channel_by_name_locked(orig_peername);
+		if (chan_ptr && strcasecmp(orig_peername, peer->name) != 0) { 
 			/* old channel */
-			chan_ptr = ast_get_channel_by_name_locked(orig_peername);
 			if (chan_ptr) {
 				if (!ast_bridged_channel(chan_ptr)) {
 					struct ast_cdr *cur;
@@ -1826,13 +1826,15 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 					if (cur)
 						ast_cdr_specialized_reset(peer_cdr,0);
 				}
-				ast_channel_unlock(chan_ptr);
 			}
 			/* new channel */
 			ast_cdr_specialized_reset(new_peer_cdr,0);
 		} else {
-			ast_cdr_specialized_reset(peer_cdr,0); /* nothing changed, reset the peer_cdr  */
+			if (chan_ptr)
+				ast_cdr_specialized_reset(peer_cdr,0); /* nothing changed, reset the peer_cdr  */
 		}
+		if (chan_ptr)
+			ast_channel_unlock(chan_ptr);
 	}
 	return res;
 }