h264: reject unsupported 422 9 bit streams

[ffmpeg] / libavcodec / dvdata.c

diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index 03e8fcc1a00d03c2eeee9605747b0dcfdf9857cf..66265bc331c497bcb1f451f19151f74d6b7f1a29 100644 (file)
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -249,11 +249,13 @@ static const DVprofile dv_profiles[] = {
 const DVprofile* ff_dv_frame_profile2(AVCodecContext* codec, const DVprofile *sys,
                                   const uint8_t* frame, unsigned buf_size)
 {
-   int i;
+   int i, dsf, stype;
 
-   int dsf = (frame[3] & 0x80) >> 7;
+   if(buf_size < DV_PROFILE_BYTES)
+       return NULL;
 
-   int stype = frame[80*5 + 48 + 3] & 0x1f;
+   dsf = (frame[3] & 0x80) >> 7;
+   stype = frame[80*5 + 48 + 3] & 0x1f;
 
    /* 576i50 25Mbps 4:1:1 is a special case */
    if (dsf == 1 && stype == 0 && frame[4] & 0x07 /* the APT field */) {