diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-16 15:19:52 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-10-04 03:26:25 +0200 |
| commit | 9272aa469848cdd6516050e702acac6ecd1ed9cd (patch) | |
| tree | 3443f960d6666d9373f7b6395a9a289a5f115130 | |
| parent | aeca97a7b5c1ea966ace310dbf4db52d64faa698 (diff) | |
| download | ffmpeg-9272aa469848cdd6516050e702acac6ecd1ed9cd.tar.gz | |
mace: Make sure that the channel count is set to a valid value
Also return a proper error code.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e1f3847f860a1094a46be4c5f10db8df616c3135)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/mace.c
| -rw-r--r-- | libavcodec/mace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mace.c b/libavcodec/mace.c index c78a207a09..5074e4bb14 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -229,8 +229,8 @@ static av_cold int mace_decode_init(AVCodecContext * avctx) { MACEContext *ctx = avctx->priv_data; - if (avctx->channels > 2) - return -1; + if (avctx->channels > 2 || avctx->channels < 1) + return AVERROR(EINVAL); avctx->sample_fmt = AV_SAMPLE_FMT_S16P; avcodec_get_frame_defaults(&ctx->frame); |