diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 17:18:26 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 17:18:26 +0000 |
| commit | 4b0599ec5c090deb624c97154a57e19153f4dc10 (patch) | |
| tree | 32cd5591130707baf2f6cc2a6e14569b71e6faf3 /main | |
| parent | e4684cc5ab720dec9d8f2a61b45bbb6e34cabbbb (diff) | |
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.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184266 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -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; } |