[FFmpeg-cvslog] shorten: set invalid channels count to 0

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar  5 15:13:04 2013 +0100| [21d568be179c54a1596d1377b4da7fbe755bfe7f] | committer: Luca Barbato

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 at gentoo.org>

CC: libav-stable at libav.org

(cherry picked from commit c10da30d8426a1f681d99a780b6e311f7fb4e5c5)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21d568be179c54a1596d1377b4da7fbe755bfe7f
---

 libavcodec/shorten.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 1dc010f..50fc506 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -345,6 +345,7 @@ static int read_header(ShortenContext *s)
     s->channels = get_uint(s, CHANSIZE);
     if (s->channels <= 0 || 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;