avresample: Reallocate the internal buffer to the correct size
authorLuca Barbato <lu_zero@gentoo.org>
Mon, 27 Apr 2015 23:55:10 +0000 (01:55 +0200)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Tue, 19 May 2015 11:13:33 +0000 (12:13 +0100)
Fixes the corner case in which the internal buffer size
is larger than input buffer provided and resizing it
before moving the left over samples would make it write
to now unallocated memory.

Bug-Id: 825
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavresample/resample.c

index 4553b2c..679e9e9 100644 (file)
@@ -432,7 +432,9 @@ int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src)
         int bps = av_get_bytes_per_sample(c->avr->internal_sample_fmt);
         int i;
 
-        ret = ff_audio_data_realloc(c->buffer, in_samples + c->padding_size);
+        ret = ff_audio_data_realloc(c->buffer,
+                                    FFMAX(in_samples, in_leftover) +
+                                    c->padding_size);
         if (ret < 0) {
             av_log(c->avr, AV_LOG_ERROR, "Error reallocating resampling buffer\n");
             return AVERROR(ENOMEM);