Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-14 22:29:19 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-06-10 03:13:11 +0300
commit3fedff39852553692b5cb6222ff5d9f492f3d559 (patch)
tree0fbd3fb7d0d04960c68d9dcd71ca4782dcd5079f
parentc532c56e7b77ee30b86d218d6407d17575fc66a0 (diff)
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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index d4c8676686..801a380df2 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -838,6 +838,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);
}