diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-21 11:49:33 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-04 01:07:49 +0100 |
| commit | 800ab099e332c93c90634b14309c5d56659223a8 (patch) | |
| tree | 356cb4305eb14a0c5d23be9c9f45c8aab8ae07cd | |
| parent | e6b225532933655d95266ce772b8a45b14aa27ec (diff) | |
| download | ffmpeg-800ab099e332c93c90634b14309c5d56659223a8.tar.gz | |
smacker: validate channels and sample format.
(cherry picked from commit ff1f89de2da3472d133e2c95bf7c9ad2d88df33d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 0c1aa16224..0b7a19aa32 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -607,6 +607,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); |