[FFmpeg-cvslog] mlpdec: dont leave a invalid huff_lsb in the context.

Michael Niedermayer git at videolan.org
Thu Feb 14 12:18:52 CET 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 18 00:22:39 2013 +0100| [e1a86b1433f1ea39a1197b2353afad8e88e51009] | committer: Michael Niedermayer

mlpdec: dont leave a invalid huff_lsb in the context.

Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4aed4f58465fa0d6940ce72c0dad90caab3ed36e)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index c7de13c..6d27417 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -720,6 +720,7 @@ static int read_channel_params(MLPDecodeContext *m, unsigned int substr,
 
     if (cp->huff_lsbs > 24) {
         av_log(m->avctx, AV_LOG_ERROR, "Invalid huff_lsbs.\n");
+        cp->huff_lsbs = 0;
         return AVERROR_INVALIDDATA;
     }
 



More information about the ffmpeg-cvslog mailing list