aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKieran Kunhya <kierank@obe.tv>2015-10-26 23:09:44 +0000
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-11-26 01:38:17 +0100
commit458b1fda34153510cdc9d4fee95f718aec665e9c (patch)
tree3da64fb511b2974c4702c9ee41d81a83e277d074
parent5ed5acb91070272dc4a5e2ae16eccb2f71311913 (diff)
downloadffmpeg-458b1fda34153510cdc9d4fee95f718aec665e9c.tar.gz
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@niedermayer.cc> (cherry picked from commit b3e5f15b95f04a35821f63f6fd89ddd60f666a59) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-rw-r--r--libavcodec/opusdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index 7acc7cf3bd..c22a2db6c2 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));