[asterisk-commits] trunk - r8438 in /trunk: ./ channel.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Jan 22 11:53:14 2006
New Revision: 8438

URL: http://svn.digium.com/view/asterisk?rev=8438&view=rev
Log:
Merged revisions 8437 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r8437 | russell | 2006-01-22 12:47:13 -0500 (Sun, 22 Jan 2006) | 2 lines

fix MixMonitor crash (issue #6321, probably others)

........

Modified:
    trunk/   (props changed)
    trunk/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=8438&r1=8437&r2=8438&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Sun Jan 22 11:53:14 2006
@@ -3911,7 +3911,7 @@
 		}
 
 		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;