Module: libav
Branch: master
Commit: c10da30d8426a1f681d99a780b6e311f7fb4e5c5

Author:    Michael Niedermayer <[email protected]>
Committer: Luca Barbato <[email protected]>
Date:      Tue Mar  5 15:13:04 2013 +0100

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 <[email protected]>

---

 libavcodec/shorten.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index e678ee8..d99877b 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 <= 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;

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to