[asterisk-commits] file: branch file/bridging-softmixgen2 r183653 - in /team/file/bridging-softm...

[SVN commits to the Asterisk project]

Author: file
Date: Sun Mar 22 16:02:02 2009
New Revision: 183653

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183653
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:
    team/file/bridging-softmixgen2/   (props changed)
    team/file/bridging-softmixgen2/main/bridging.c

Propchange: team/file/bridging-softmixgen2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar 22 16:02:02 2009
@@ -1,1 +1,1 @@
-/trunk:1-183574
+/trunk:1-183652

Modified: team/file/bridging-softmixgen2/main/bridging.c
URL: http://svn.digium.com/svn-view/asterisk/team/file/bridging-softmixgen2/main/bridging.c?view=diff&rev=183653&r1=183652&r2=183653
==============================================================================
--- team/file/bridging-softmixgen2/main/bridging.c (original)
+++ team/file/bridging-softmixgen2/main/bridging.c Sun Mar 22 16:02:02 2009
@@ -327,7 +327,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;
 		}