diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-17 23:43:58 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-21 14:40:36 +0200 |
| commit | 11b72c073c7f59ee19067ddaa7ea7755b972d793 (patch) | |
| tree | dcd2a21ea8b113a07e050f4dbd64a17b33888bb2 | |
| parent | bb6702f20675868fba91f6be5e5120b5d8ef031f (diff) | |
| download | ffmpeg-11b72c073c7f59ee19067ddaa7ea7755b972d793.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>
| -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 910b933dd9..2383903625 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1486,7 +1486,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); |