diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-17 03:18:58 +0100 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-02-16 15:18:45 -0500 |
| commit | c509f4f74713b035a06f79cb4d00e708f5226bc5 (patch) | |
| tree | eb0ac38424d21ad95ee8e83a58bd88d4f013d075 /libavcodec/atrac3.c | |
| parent | 9fb7a5af97d8c084c3af2566070d09eae0ab49fc (diff) | |
atrac3: Fix crash in tonal component decoding.
Add a check to avoid writing past the end of the channel_unit.components[]
array.
Bug Found by: cosminamironesei
Fixes CVE-2012-0853
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Diffstat (limited to 'libavcodec/atrac3.c')
| -rw-r--r-- | libavcodec/atrac3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index fd036e720a..136b16c36d 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -402,6 +402,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 = SAMPLES_PER_FRAME - pComponent[component_count].pos; coded_values = coded_values_per_component + 1; |