diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-14 21:29:19 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-21 20:43:39 +0200 |
commit | 4a49f1e764d2fe2060f38f6b671fd3c0d3bbfa13 (patch) | |
tree | 8d6402616133f32e6ff228dd81ad78889fd52a12 | |
parent | 474bfd54388566f752b09eb9df8a038f04d238ba (diff) | |
download | ffmpeg-4a49f1e764d2fe2060f38f6b671fd3c0d3bbfa13.tar.gz |
avcodec/dcadec: Check subsubframes
Fixes: CID1239152
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a9bf628bfdad142763880a3d1ccb6058040dda57)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/dcadec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 3e994daa10..a78986ab4d 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -856,6 +856,10 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) if (!base_channel) { s->subsubframes[s->current_subframe] = get_bits(&s->gb, 2) + 1; + if (block_index + s->subsubframes[s->current_subframe] > s->sample_blocks/8) { + s->subsubframes[s->current_subframe] = 1; + return AVERROR_INVALIDDATA; + } s->partial_samples[s->current_subframe] = get_bits(&s->gb, 3); } |