diff options
| author | Joshua Colp <jcolp@digium.com> | 2009-03-22 21:00:28 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2009-03-22 21:00:28 +0000 |
| commit | dc9c58104e44fdf4ecd9d98f367e9e733f052cfe (patch) | |
| tree | ecbd5a3812d9e996750650b929cf1dded821acff /main/bridging.c | |
| parent | f4d0347d027c9040d55cb6f88a86babefde17ece (diff) | |
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
Diffstat (limited to 'main/bridging.c')
| -rw-r--r-- | main/bridging.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/bridging.c b/main/bridging.c index 4546c8353..4306680d6 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; } |