diff options
| author | Alex Converse <alex.converse@gmail.com> | 2011-09-08 11:02:43 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-09-08 11:02:43 -0700 |
| commit | dba2b63a98bdcac7bda1a8a2c48950518c075e17 (patch) | |
| tree | 8260073c8bfabf4364ed5549c7f229be35e50dcb /libavcodec/wavpack.c | |
| parent | 6376362d15ccbc02e15d0b3b7a7a5d862efd6b91 (diff) | |
| download | ffmpeg-dba2b63a98bdcac7bda1a8a2c48950518c075e17.tar.gz | |
wavpack: Check error codes rather than working around error conditions.
Diffstat (limited to 'libavcodec/wavpack.c')
| -rw-r--r-- | libavcodec/wavpack.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 53aab6dfd2..0604452b80 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1120,6 +1120,10 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_S32); else samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_FLT); + + if (samplecount < 0) + return -1; + samplecount >>= 1; }else{ const int channel_stride = avctx->channels; @@ -1131,11 +1135,14 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, else samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_FLT); + if (samplecount < 0) + return -1; + if(s->stereo && avctx->sample_fmt == AV_SAMPLE_FMT_S16){ int16_t *dst = (int16_t*)samples + 1; int16_t *src = (int16_t*)samples; int cnt = samplecount; - while(cnt-- > 0){ + while(cnt--){ *dst = *src; src += channel_stride; dst += channel_stride; @@ -1144,7 +1151,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, int32_t *dst = (int32_t*)samples + 1; int32_t *src = (int32_t*)samples; int cnt = samplecount; - while(cnt-- > 0){ + while(cnt--){ *dst = *src; src += channel_stride; dst += channel_stride; @@ -1153,7 +1160,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, float *dst = (float*)samples + 1; float *src = (float*)samples; int cnt = samplecount; - while(cnt-- > 0){ + while(cnt--){ *dst = *src; src += channel_stride; dst += channel_stride; |