diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 17:22:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 17:22:53 +0200 |
| commit | 0a41da3e9d2090c562b752d086bcbd4dee69c796 (patch) | |
| tree | b020af05513ba8d508a7d2d095b1ef904da93454 /libavcodec/shorten.c | |
| parent | afe09e490a30c97aad6736f99d186634c354eb34 (diff) | |
| parent | d785f6940144eb6ce4c24309ed034056b81395bc (diff) | |
| download | ffmpeg-0a41da3e9d2090c562b752d086bcbd4dee69c796.tar.gz | |
Merge commit 'd785f6940144eb6ce4c24309ed034056b81395bc' into release/0.8
* commit 'd785f6940144eb6ce4c24309ed034056b81395bc':
shorten: validate that the channel count in the header is not <= 0
matroskadec: request a read buffer for the wav header
h264: check for luma and chroma bit depth being equal
xxan: fix invalid memory access in xan_decode_frame_type0()
wmadec: require block_align to be set.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/shorten.c')
| -rw-r--r-- | libavcodec/shorten.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 50332aaf68..e8b4cb9d95 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -342,7 +342,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, s->internal_ftype = get_uint(s, TYPESIZE); s->channels = get_uint(s, CHANSIZE); - if (s->channels > MAX_CHANNELS) { + if (s->channels <= 0 || s->channels > MAX_CHANNELS) { av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", s->channels); return -1; } |