]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
prevent O(n^2) execution of ff_mpa_decode_header() for valid mp3 files
authormichael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 3 Dec 2007 04:49:01 +0000 (04:49 +0000)
committermichael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 3 Dec 2007 04:49:01 +0000 (04:49 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11144 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/mp3.c

index 4ad9b67d5b6d40b61e1c31983df737b36cad2474..74bd275077c1c9c4dad9fc62b94049a1c3025967 100644 (file)
@@ -418,6 +418,8 @@ static int mp3_read_probe(AVProbeData *p)
         max_frames = FFMAX(max_frames, frames);
         if(buf == p->buf)
             first_frames= frames;
+        if(buf2 > end)
+            break;
     }
     if   (first_frames>=3) return AVPROBE_SCORE_MAX/2+1;
     else if(max_frames>=3) return AVPROBE_SCORE_MAX/4;