aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-11-24 11:16:46 +0100
committerAnton Khirnov <anton@khirnov.net>2014-11-27 14:06:03 +0100
commit1973079417e8701b52ba810a72cb6c7c6f7f9a56 (patch)
tree4a051f9e0c5b4cf9527ec68231d71b3c12ed1625
parent96fda42a8f9bf84beaaf7f5991d17f2a057de86c (diff)
downloadffmpeg-1973079417e8701b52ba810a72cb6c7c6f7f9a56.tar.gz
opusdec: make sure all substreams have the same number of coded samples
Fixes invalid writes with invalid multichannel streams. CC:libav-stable@libav.org
-rw-r--r--libavcodec/opusdec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index bf3a54b16b..771922e973 100644
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opusdec.c
@@ -500,6 +500,12 @@ static int opus_decode_packet(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "Error parsing the packet header.\n");
return ret;
}
+ if (coded_samples != s->packet.frame_count * s->packet.frame_duration) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Mismatching coded sample count in substream %d.\n", i);
+ return AVERROR_INVALIDDATA;
+ }
+
s->silk_samplerate = get_silk_samplerate(s->packet.config);
}