[FFmpeg-cvslog] avcodec/ffv1dec: Clear quant_table_count if its invalid
Michael Niedermayer
git at videolan.org
Sun Dec 6 14:16:02 CET 2015
ffmpeg | branch: release/2.0 | Michael Niedermayer <michael at niedermayer.cc> | Sat Nov 14 13:21:58 2015 +0100| [2789b48b4ef5b6548eaffeb9b532b2d8f4729db5] | committer: Carl Eugen Hoyos
avcodec/ffv1dec: Clear quant_table_count if its invalid
Fixes deallocation of corrupted pointer
Fixes: 343dfbe142a38b521ed069dc4ea7c03b/signal_sigsegv_421427_4074_ffb11959610278cd40dbc153464aa254.avi
No releases affected
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit e04126072e984f8db5db9da9303c89ae01f7d6bb)
Fixes ticket #5052.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2789b48b4ef5b6548eaffeb9b532b2d8f4729db5
---
libavcodec/ffv1dec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index c64a43e..3ed9650 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -523,6 +523,7 @@ static int read_extra_header(FFV1Context *f)
f->quant_table_count = get_symbol(c, state, 0);
if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES || !f->quant_table_count) {
av_log(f->avctx, AV_LOG_ERROR, "quant table count %d is invalid\n", f->quant_table_count);
+ f->quant_table_count = 0;
return AVERROR_INVALIDDATA;
}
More information about the ffmpeg-cvslog
mailing list