ffmpeg | branch: release/2.4 | Kieran Kunhya <kier...@obe.tv> | Mon Oct 26 
23:09:44 2015 +0000| [458b1fda34153510cdc9d4fee95f718aec665e9c] | committer: 
Andreas Cadhalpun

opusdec: Don't run vector_fmul_scalar on zero length arrays

Fixes crashes on fuzzed files
Fixes Ticket4969 part2

Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit b3e5f15b95f04a35821f63f6fd89ddd60f666a59)
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>

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

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

diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index 7acc7cf..c22a2db 100644
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opusdec.c
@@ -589,7 +589,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));

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to