[FFmpeg-cvslog] lavfi/audio: fix size of copied samples.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Wed Jun  6 13:25:34 2012 +0200| [9915a33fc2c90b314fe696a1260e2bbb58827e67] | committer: Nicolas George

lavfi/audio: fix size of copied samples.

Fixes sporadic segfaults with some filters.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9915a33fc2c90b314fe696a1260e2bbb58827e67
---

 libavfilter/audio.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavfilter/audio.c b/libavfilter/audio.c
index 0616f97..a769c78 100644
--- a/libavfilter/audio.c
+++ b/libavfilter/audio.c
@@ -190,7 +190,7 @@ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
     /* prepare to copy the samples if the buffer has insufficient permissions */
     if ((dst->min_perms & samplesref->perms) != dst->min_perms ||
         dst->rej_perms & samplesref->perms) {
-        int  i, planar = av_sample_fmt_is_planar(samplesref->format);
+        int  i, size, planar = av_sample_fmt_is_planar(samplesref->format);
         int planes = !planar ? 1:
                      av_get_channel_layout_nb_channels(samplesref->audio->channel_layout);
 
@@ -204,10 +204,13 @@ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
         link->cur_buf->audio->sample_rate = samplesref->audio->sample_rate;
 
         /* Copy actual data into new samples buffer */
+        /* src can be larger than dst if it was allocated larger than necessary.
+           dst can be slightly larger due to extra alignment padding. */
+        size = FFMIN(samplesref->linesize[0], link->cur_buf->linesize[0]);
         for (i = 0; samplesref->data[i] && i < 8; i++)
-            memcpy(link->cur_buf->data[i], samplesref->data[i], samplesref->linesize[0]);
+            memcpy(link->cur_buf->data[i], samplesref->data[i], size);
         for (i = 0; i < planes; i++)
-            memcpy(link->cur_buf->extended_data[i], samplesref->extended_data[i], samplesref->linesize[0]);
+            memcpy(link->cur_buf->extended_data[i], samplesref->extended_data[i], size);
 
         avfilter_unref_buffer(samplesref);
     } else