diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 11:26:53 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 11:26:53 +0100 |
commit | 96008082dbd3a2475ad429b02bf73ba20b4ea9bf (patch) | |
tree | 6f441d4c7afbdb359c98dac5d5420ab5f9be4764 /libavcodec/vqavideo.c | |
parent | c63f9fb37a7b7da03bed6d79115f7f2e36607808 (diff) | |
parent | 488f87be873506abb01d67708a67c10a4dd29283 (diff) | |
download | ffmpeg-96008082dbd3a2475ad429b02bf73ba20b4ea9bf.tar.gz |
Merge commit '488f87be873506abb01d67708a67c10a4dd29283'
* commit '488f87be873506abb01d67708a67c10a4dd29283':
roqvideodec: check dimensions validity
vqavideo: check chunk sizes before reading chunks
qdm2: check array index before use, fix out of array accesses
Conflicts:
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vqavideo.c')
-rw-r--r-- | libavcodec/vqavideo.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index e89d4d1fcf..43b3aaf57c 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -538,7 +538,8 @@ static int vqa_decode_chunk(VqaContext *s) chunk_size = bytestream2_get_be32(&s->gb); if (chunk_size > MAX_CODEBOOK_SIZE - s->next_codebook_buffer_index) { - av_log(s->avctx, AV_LOG_ERROR, "cbp0 chunk too large (0x%X bytes)\n", chunk_size); + av_log(s->avctx, AV_LOG_ERROR, "cbp0 chunk too large (%u bytes)\n", + chunk_size); return AVERROR_INVALIDDATA; } @@ -566,7 +567,8 @@ static int vqa_decode_chunk(VqaContext *s) chunk_size = bytestream2_get_be32(&s->gb); if (chunk_size > MAX_CODEBOOK_SIZE - s->next_codebook_buffer_index) { - av_log(s->avctx, AV_LOG_ERROR, "cbpz chunk too large (0x%X bytes)\n", chunk_size); + av_log(s->avctx, AV_LOG_ERROR, "cbpz chunk too large (%u bytes)\n", + chunk_size); return AVERROR_INVALIDDATA; } |