diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-17 03:18:58 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-04-21 15:42:10 +0200 |
| commit | 8bb3ba55417f6bd95a6085270d9b61e39ee94645 (patch) | |
| tree | e774b30114da9db4132ed1b014bc6153bc9de7dd /libavcodec | |
| parent | 5a92aa378d066369c6d9a82192c274ae4b8997f0 (diff) | |
| download | ffmpeg-8bb3ba55417f6bd95a6085270d9b61e39ee94645.tar.gz | |
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>
(cherry picked from commit c509f4f74713b035a06f79cb4d00e708f5226bc5)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit f43b6e2b1ed47a1254a5d44c700a7fad5e9784be)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit f728ad26f0ec87650d2986a892785c0e2b97d161)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 224025d852dcc42f752c0922fef7121808d1e42f)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec')
| -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 81d25ec204..9205f35314 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; |