[SCM] libav/experimental: check for sane values in ogg_get_length(), fix lol-ffplay.ogm fuzz test

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:55:01 UTC 2013


The following commit has been merged in the experimental branch:
commit e22f2aaf99c59d788f292c4d7594493068eb4d69
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Jan 15 22:45:50 2007 +0000

    check for sane values in ogg_get_length(), fix lol-ffplay.ogm fuzz test
    
    Originally committed as revision 7536 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/ogg2.c b/libavformat/ogg2.c
index d630d4a..64e7733 100644
--- a/libavformat/ogg2.c
+++ b/libavformat/ogg2.c
@@ -484,7 +484,8 @@ ogg_get_length (AVFormatContext * s)
     url_fseek (&s->pb, end, SEEK_SET);
 
     while (!ogg_read_page (s, &i)){
-        if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0)
+        if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 &&
+            ogg->streams[i].codec)
             idx = i;
     }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list