automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8440 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index 777432940ebe454289fa5d36734e1da7797c288c..56d06978d2af76a47b8eb5944bb6a3d38e96f2ed 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -3830,7 +3830,7 @@ static void copy_data_from_queue(struct ast_channel_spy_queue *queue, short *buf
                }
 
                tocopy = (f->samples > samples) ? samples : f->samples;
-               bytestocopy = ast_codec_get_len(queue->format, samples);
+               bytestocopy = ast_codec_get_len(queue->format, tocopy);
                memcpy(buf, f->data, bytestocopy);
                samples -= tocopy;
                buf += tocopy;