From: Joshua Colp <jcolp@digium.com>
Date: Sun, 22 Mar 2009 21:00:28 +0000 (+0000)
Subject: Fix a minor logic flaw with the bridge generic thread.
X-Git-Tag: 11.0.0-beta1~5195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc9c58104e44fdf4ecd9d98f367e9e733f052cfe;p=thirdparty%2Fasterisk.git

Fix a minor logic flaw with the bridge generic thread.

We only want to move the channel pointers that are actually present.


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

diff --git a/main/bridging.c b/main/bridging.c
index 4546c8353e..4306680d63 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -319,7 +319,7 @@ static int generic_thread_loop(struct ast_bridge *bridge)
 		/* 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;
 		}