diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 05:34:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 05:34:13 +0200 |
| commit | 9195c26d454ca750359db87b1127cd4926c536bd (patch) | |
| tree | eb2c6806bdd73f06bd84c719240674d0a0d42b41 /libavcodec | |
| parent | 0089fb79cc11eef199c0c63da472aefbeb9fed2c (diff) | |
| download | ffmpeg-9195c26d454ca750359db87b1127cd4926c536bd.tar.gz | |
avcodec/rv34: fix crash while seeking on very damaged file
Fixes null pointer dereference
Fixes Ticket2093
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/rv34.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 873ec3c5a8..d82b41e2a0 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); |