[FFmpeg-cvslog] avcodec/vp3: pass correct context to av_log()

Michael Niedermayer git at videolan.org
Fri Feb 6 00:46:45 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb  6 00:33:00 2015 +0100| [d41b66a1a216956964077b383e6e234d518f17d7] | committer: Michael Niedermayer

avcodec/vp3: pass correct context to av_log()

Fixes null pointer dereference
Fixes: signal_sigsegv_000_3694_cov_1050071691_theora.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/vp3.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 37d41b8..8a7c6b2 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2277,7 +2277,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
     if (av_image_check_size(visible_width, visible_height, 0, avctx) < 0 ||
         visible_width  + offset_x > s->width ||
         visible_height + offset_y > s->height) {
-        av_log(s, AV_LOG_ERROR,
+        av_log(avctx, AV_LOG_ERROR,
                "Invalid frame dimensions - w:%d h:%d x:%d y:%d (%dx%d).\n",
                visible_width, visible_height, offset_x, offset_y,
                s->width, s->height);



More information about the ffmpeg-cvslog mailing list