aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-17 03:18:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-12 22:15:00 +0100
commitf13de3c653168f9d9a0bf8653b175035a5d9230b (patch)
tree12c305485456660275d076d86434c510486d17e7
parent1eb78722383dd6834eb384d292cda602b98d1a9b (diff)
downloadffmpeg-f13de3c653168f9d9a0bf8653b175035a5d9230b.tar.gz
atrac3: Fix crash in tonal component decoding.
Fixes Ticket780 Bug Found by: cosminamironesei Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9af6abdc17deb95c9b1f1d9242ba49b8b5e0b016) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/atrac3.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 81d25ec204..22dfdfc426 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -454,6 +454,8 @@ static int decodeTonalComponents (GetBitContext *gb, tonal_component *pComponent
for (k=0; k<coded_components; k++) {
sfIndx = get_bits(gb,6);
+ if(component_count>=64)
+ return AVERROR_INVALIDDATA;
pComponent[component_count].pos = j * 64 + (get_bits(gb,6));
max_coded_values = 1024 - pComponent[component_count].pos;
coded_values = coded_values_per_component + 1;