diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-09 01:03:13 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-08-24 11:32:15 +0200 |
| commit | 8f3fe7c696866c965ebc4444aaa5487bb1cd53f1 (patch) | |
| tree | c9baa2212611aecda40330fb287b2758f5da0185 | |
| parent | 64bcb5d35013a4a41969b124a3dcf9a21aef9346 (diff) | |
| download | ffmpeg-8f3fe7c696866c965ebc4444aaa5487bb1cd53f1.tar.gz | |
atrac3: fix error handling
decode_tonal_components returns a proper AVERROR.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 874c8a17ac9b04fb7ac23d003e54e3662dd23b4e)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/atrac3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 910c15e473..632cc37a0b 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -664,8 +664,8 @@ static int decode_channel_sound_unit(ATRAC3Context *q, GetBitContext *gb, snd->num_components = decode_tonal_components(gb, snd->components, snd->bands_coded); - if (snd->num_components == -1) - return -1; + if (snd->num_components < 0) + return snd->num_components; num_subbands = decode_spectrum(gb, snd->spectrum); |