[FFmpeg-cvslog] r22378 - trunk/libavcodec/rv34.c

[kostya]

Author: kostya
Date: Tue Mar  9 08:14:34 2010
New Revision: 22378

Log:
Check for reference frames so RV 3/4 won't segfault trying to copy data from
nonexisting reference.

Modified:
   trunk/libavcodec/rv34.c

Modified: trunk/libavcodec/rv34.c
==============================================================================
--- trunk/libavcodec/rv34.c	Tue Mar  9 07:52:33 2010	(r22377)
+++ trunk/libavcodec/rv34.c	Tue Mar  9 08:14:34 2010	(r22378)
@@ -1452,8 +1452,12 @@ int ff_rv34_decode_frame(AVCodecContext 
         av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n");
         return -1;
     }
+    if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_P_TYPE)
+        return -1;
     if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_B_TYPE)
         return -1;
+    if((!s->next_picture_ptr || !s->next_picture_ptr->data[0]) && si.type == FF_B_TYPE)
+        return -1;
     /* skip b frames if we are in a hurry */
     if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size;
     if(   (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE)