ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Jul 11 05:34:13 2014 +0200| [9195c26d454ca750359db87b1127cd4926c536bd] | committer: Michael Niedermayer
avcodec/rv34: fix crash while seeking on very damaged file Fixes null pointer dereference Fixes Ticket2093 Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9195c26d454ca750359db87b1127cd4926c536bd --- libavcodec/rv34.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 873ec3c..d82b41e 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1685,7 +1685,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, /* first slice */ if (si.start == 0) { - if (s->mb_num_left > 0) { + if (s->mb_num_left > 0 && s->current_picture_ptr) { av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.\n", s->mb_num_left); ff_er_frame_end(&s->er); _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
