diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-05 15:13:04 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-03-12 20:05:39 +0100 |
| commit | a4a97e5f3c80256871c97d84e9298f26fd66811f (patch) | |
| tree | 90f019a3dae69273192acfbf34043e70c475059c | |
| parent | 9314af3b2e8518e1a7ad91bdc2429224aacc2df5 (diff) | |
| download | ffmpeg-a4a97e5f3c80256871c97d84e9298f26fd66811f.tar.gz | |
shorten: set invalid channels count to 0
Prevent the loop shorten_decode_close from writing and freeing out of
the array boundary.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
(cherry picked from commit c10da30d8426a1f681d99a780b6e311f7fb4e5c5)
(cherry picked from commit 21d568be179c54a1596d1377b4da7fbe755bfe7f)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/shorten.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 83777fb934..a8b5713f56 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -341,6 +341,7 @@ static int read_header(ShortenContext *s) s->channels = get_uint(s, CHANSIZE); if (s->channels > MAX_CHANNELS) { av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", s->channels); + s->channels = 0; return -1; } s->avctx->channels = s->channels; |