[FFmpeg-devel] [PATCH] Avoid NULL dereference on corrupted bitstream with real decoder.

fenrir at elivagar.org fenrir at elivagar.org
Sat Sep 17 23:43:58 CEST 2011


From: Laurent Aimar <fenrir at videolan.org>

rv34_decode_slice() can return without allocating any pictures.
---
 libavcodec/rv34.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index e5dde1a..8223e92 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1534,7 +1534,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);
-- 
1.7.2.5



More information about the ffmpeg-devel mailing list