From: Laurent Aimar <fenrir@videolan.org>
Date: Sat, 17 Sep 2011 21:43:58 +0000 (+0200)
Subject: Avoid NULL dereference on corrupted bitstream with real decoder.
X-Git-Tag: android-x86-4.4-r1~16150
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=140dbcff357351570426efd0e0bc00e380f5436e;p=android-x86%2Fexternal-ffmpeg.git

Avoid NULL dereference on corrupted bitstream with real decoder.

rv34_decode_slice() can return without allocating any pictures.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index ca727a5500..963bd1e3da 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1538,7 +1538,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);