diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-06-06 13:25:34 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-06-07 17:03:45 +0200 |
| commit | 9915a33fc2c90b314fe696a1260e2bbb58827e67 (patch) | |
| tree | 1194abd13ace7f8d52c81d3437cd624a176c34ba | |
| parent | 8d1de449f0062682f8562fc0a96b13dfaa3723e7 (diff) | |
| download | ffmpeg-9915a33fc2c90b314fe696a1260e2bbb58827e67.tar.gz | |
lavfi/audio: fix size of copied samples.
Fixes sporadic segfaults with some filters.
| -rw-r--r-- | libavfilter/audio.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 0616f97551..a769c78b9c 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 |