[FFmpeg-cvslog] rv34: Avoid NULL dereference on corrupted bitstream

[Laurent Aimar]

ffmpeg | branch: release/0.6 | Laurent Aimar <fenrir at videolan.org> | Sat Sep 17 23:43:58 2011 +0200| [35f1888585e0ffa2f1334cf92fc0a16fb4a113a6] | committer: Reinhard Tartler

rv34: Avoid NULL dereference on corrupted bitstream

rv34_decode_slice() can return without allocating any pictures.

Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit d0f6ab0298f2309c6104626787ed73416298b019)

Signed-off-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35f1888585e0ffa2f1334cf92fc0a16fb4a113a6
---

 libavcodec/rv34.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 88652f9..a1dc799 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);