diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-03-05 17:12:35 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-03-12 13:37:10 +0100 |
| commit | 88089eecfd7e604d40d078b4f4206c647cb2e2b4 (patch) | |
| tree | 25145631b8b8af38c274399f31e5a2604bb5d01b | |
| parent | 0daf1428e82926dc5a8c72a0ff4c93aaa8a84ed9 (diff) | |
| download | ffmpeg-88089eecfd7e604d40d078b4f4206c647cb2e2b4.tar.gz | |
shorten: use the unsigned type where needed
get_uint returns an unsigned value, use an unsigned to store
blocksize to make sure the comparison logic is correct and report
correctly the error for the channel count not supported.
CC: libav-stable@libav.org
(cherry picked from commit 5cf7c72757779a740e897a97710aac044fe5258c)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/shorten.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 89346b4aad..0b4a473892 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -84,7 +84,7 @@ typedef struct ShortenContext { GetBitContext gb; int min_framesize, max_framesize; - int channels; + unsigned channels; int32_t *decoded[MAX_CHANNELS]; int32_t *decoded_base[MAX_CHANNELS]; @@ -343,7 +343,11 @@ static int read_header(ShortenContext *s) s->internal_ftype = get_uint(s, TYPESIZE); s->channels = get_uint(s, CHANSIZE); - if (s->channels <= 0 || s->channels > MAX_CHANNELS) { + if (!s->channels) { + av_log(s->avctx, AV_LOG_ERROR, "No channels reported\n"); + return AVERROR_INVALIDDATA; + } + if (s->channels > MAX_CHANNELS) { av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", s->channels); s->channels = 0; return AVERROR_INVALIDDATA; @@ -352,7 +356,8 @@ static int read_header(ShortenContext *s) /* get blocksize if version > 0 */ if (s->version > 0) { - int skip_bytes, blocksize; + int skip_bytes; + unsigned blocksize; blocksize = get_uint(s, av_log2(DEFAULT_BLOCK_SIZE)); if (!blocksize || blocksize > MAX_BLOCKSIZE) { @@ -504,7 +509,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, s->bitshift = get_ur_golomb_shorten(&s->gb, BITSHIFTSIZE); break; case FN_BLOCKSIZE: { - int blocksize = get_uint(s, av_log2(s->blocksize)); + unsigned blocksize = get_uint(s, av_log2(s->blocksize)); if (blocksize > s->blocksize) { av_log(avctx, AV_LOG_ERROR, "Increasing block size is not supported\n"); |