diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 02:07:26 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 02:08:50 +0200 |
commit | ae038c0914460646503be083e30e3971093239a1 (patch) | |
tree | 9747ef156681ac2a8ed9b58ba30cee1ebd662c84 | |
parent | 712ef25116b4db6dcb84bef6e1517028bc103858 (diff) | |
download | ffmpeg-ae038c0914460646503be083e30e3971093239a1.tar.gz |
vorbisdec: propagate errors from setup_classifs()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/vorbisdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 7396c168ec..7a7a6dd871 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1397,7 +1397,9 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, voffset = vr->begin; for (partition_count = 0; partition_count < ptns_to_read;) { // SPEC error if (!pass) { - setup_classifs(vc, vr, do_not_decode, ch_used, partition_count); + int ret; + if ((ret = setup_classifs(vc, vr, do_not_decode, ch_used, partition_count)) < 0) + return ret; } for (i = 0; (i < c_p_c) && (partition_count < ptns_to_read); ++i) { for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) { |