diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-17 23:43:58 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-12-24 12:20:33 +0100 |
| commit | 35f1888585e0ffa2f1334cf92fc0a16fb4a113a6 (patch) | |
| tree | 975db58126224fefdc1482e129ac1ab2d8156c98 | |
| parent | 7cd7461ec8013a381938b52568f9eb08ab3d1720 (diff) | |
| download | ffmpeg-35f1888585e0ffa2f1334cf92fc0a16fb4a113a6.tar.gz | |
rv34: Avoid NULL dereference on corrupted bitstream
rv34_decode_slice() can return without allocating any pictures.
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d0f6ab0298f2309c6104626787ed73416298b019)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -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 88652f9fe1..a1dc799c3e 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1494,7 +1494,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, break; } - if(last){ + if(last && s->current_picture_ptr){ if(r->loop_filter) r->loop_filter(r, s->mb_height - 1); ff_er_frame_end(s); |