avcodec/rv34: fix crash while seeking on very damaged file

Fixes null pointer dereference
Fixes Ticket2093

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-11 05:34:13 +02:00
parent 0089fb79cc
commit 9195c26d45

View File

@ -1685,7 +1685,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
/* first slice */ /* first slice */
if (si.start == 0) { 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", av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.\n",
s->mb_num_left); s->mb_num_left);
ff_er_frame_end(&s->er); ff_er_frame_end(&s->er);