diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-03 17:40:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 21:08:21 +0200 |
| commit | 5e87fa347c5b1c4b26a189c077158986d66ec6d7 (patch) | |
| tree | cad4acad44139e18987b184fe9f6cd173c4a7509 | |
| parent | 6a441ee78ee7bc49311994583455755663811243 (diff) | |
| download | ffmpeg-5e87fa347c5b1c4b26a189c077158986d66ec6d7.tar.gz | |
mpc8: fix channel checks
fix heap array overflow
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 44c10168cff41c200825448b77cb8feff0d316c9)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpc8.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 90bc8c8b96..4adc28ed25 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -138,7 +138,8 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx) c->frames = 1 << (get_bits(&gb, 3) * 2); avctx->sample_fmt = AV_SAMPLE_FMT_S16; - avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; + avctx->channel_layout = (channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; + avctx->channels = channels; if(vlc_initialized) return 0; av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n"); |