diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-21 11:49:33 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-18 17:50:46 +0100 |
| commit | 1cc0b0863572cc4339ff38b04f48b13ec64062a2 (patch) | |
| tree | f10169c4e2811f308c5aefa9c03ecadb1bbbb3b4 /libavcodec | |
| parent | b3d7fffee3bf0e2b28ce98ba609b7fd2099938db (diff) | |
| download | ffmpeg-1cc0b0863572cc4339ff38b04f48b13ec64062a2.tar.gz | |
smacker: validate channels and sample format.
(cherry picked from commit ff1f89de2da3472d133e2c95bf7c9ad2d88df33d)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/smacker.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index f3c59da7db..fd88fd2c60 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -606,6 +606,14 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size, av_log(avctx, AV_LOG_ERROR, "Frame is too large to fit in buffer\n"); return -1; } + if (stereo ^ (avctx->channels != 1)) { + av_log(avctx, AV_LOG_ERROR, "channels mismatch\n"); + return AVERROR(EINVAL); + } + if (bits && avctx->sample_fmt == AV_SAMPLE_FMT_U8) { + av_log(avctx, AV_LOG_ERROR, "sample format mismatch\n"); + return AVERROR(EINVAL); + } memset(vlc, 0, sizeof(VLC) * 4); memset(h, 0, sizeof(HuffContext) * 4); |