avidec: Dont crash on avi packets that belong to dv streams in dv in avi
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Apr 2012 15:42:09 +0000 (17:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Apr 2012 15:58:19 +0000 (17:58 +0200)
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avidec.c

index c033b62..0300316 100644 (file)
@@ -958,6 +958,11 @@ start_sync:
             st = s->streams[n];
             ast = st->priv_data;
 
+            if (!ast) {
+                av_log(s, AV_LOG_WARNING, "Skiping foreign stream %d packet\n", n);
+                continue;
+            }
+
             if(s->nb_streams>=2){
                 AVStream *st1  = s->streams[1];
                 AVIStream *ast1= st1->priv_data;