[svn-commits] file: branch 1.6.2 r184266 - in /branches/1.6.2: ./ main/bridging.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Mar 25 12:18:26 2009
New Revision: 184266

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

........
  r183652 | file | 2009-03-22 18:00:28 -0300 (Sun, 22 Mar 2009) | 4 lines
  
  Fix a minor logic flaw with the bridge generic thread.
  
  We only want to move the channel pointers that are actually present.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/bridging.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed Mar 25 12:18:26 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766,183865,183914,184037,184043,184079,184147,184151,184219-184220
+/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183652,183701,183766,183865,183914,184037,184043,184079,184147,184151,184219-184220

Modified: branches/1.6.2/main/bridging.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/bridging.c?view=diff&rev=184266&r1=184265&r2=184266
==============================================================================
--- branches/1.6.2/main/bridging.c (original)
+++ branches/1.6.2/main/bridging.c Wed Mar 25 12:18:26 2009
@@ -319,7 +319,7 @@
 		/* Move channels around for priority reasons if we have more than one channel in our array */
 		if (bridge->array_num > 1) {
 			struct ast_channel *first = bridge->array[0];
-			memmove(bridge->array, bridge->array + 1, sizeof(bridge->array) - 1);
+			memmove(bridge->array, bridge->array + 1, sizeof(struct ast_channel *) * (bridge->array_num - 1));
 			bridge->array[(bridge->array_num - 1)] = first;
 		}