[asterisk-commits] jpeeler: branch 1.6.1 r238136 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Jan  6 13:08:30 2010
New Revision: 238136

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

........
  r238134 | jpeeler | 2010-01-06 13:05:06 -0600 (Wed, 06 Jan 2010) | 10 lines
  
  Fix channel name comparison for bridge application.
  
  The channel name comparison was not comparing the whole string and therefore
  if one channel name was a substring of the other, the bridge would fail.
  
  (closes issue #16528)
  Reported by: telecos82
  Patches: 
        res_features_r236843.diff uploaded by telecos82 (license 687)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

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

Modified: branches/1.6.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/features.c?view=diff&rev=238136&r1=238135&r2=238136
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Wed Jan  6 13:08:30 2010
@@ -4486,9 +4486,7 @@
 		ast_app_parse_options(bridge_exec_options, &opts, NULL, args.options);
 
 	/* avoid bridge with ourselves */
-	if (!strncmp(chan->name, args.dest_chan, 
-		strlen(chan->name) < strlen(args.dest_chan) ? 
-		strlen(chan->name) : strlen(args.dest_chan))) {
+	if (!strcmp(chan->name, args.dest_chan)) {
 		ast_log(LOG_WARNING, "Unable to bridge channel %s with itself\n", chan->name);
 		manager_event(EVENT_FLAG_CALL, "BridgeExec",
 					"Response: Failed\r\n"