[FFmpeg-cvslog] opusdec: Don't run vector_fmul_scalar on zero length arrays

Kieran Kunhya git at videolan.org
Thu Nov 26 17:54:59 CET 2015


ffmpeg | branch: release/2.5 | Kieran Kunhya <kierank at obe.tv> | Mon Oct 26 23:09:44 2015 +0000| [cde478f52691c142514ce3dc80dfbb3d7741cd2b] | committer: Michael Niedermayer

opusdec: Don't run vector_fmul_scalar on zero length arrays

Fixes crashes on fuzzed files
Fixes Ticket4969 part2

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit b3e5f15b95f04a35821f63f6fd89ddd60f666a59)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/opusdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index 04c9218..ab81de1 100644
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opusdec.c
@@ -542,7 +542,7 @@ static int opus_decode_packet(AVCodecContext *avctx, void *data,
             memset(frame->extended_data[i], 0, frame->linesize[0]);
         }
 
-        if (c->gain_i) {
+        if (c->gain_i && decoded_samples > 0) {
             c->fdsp->vector_fmul_scalar((float*)frame->extended_data[i],
                                        (float*)frame->extended_data[i],
                                        c->gain, FFALIGN(decoded_samples, 8));



More information about the ffmpeg-cvslog mailing list