avformat/mp3dec: check the number of frames per buffer size
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 May 2014 19:02:06 +0000 (21:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 May 2014 19:05:47 +0000 (21:05 +0200)
Fixes misdetection of issue3327-libc-2.17.so

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mp3dec.c

index e04206c..8335388 100644 (file)
@@ -90,10 +90,10 @@ static int mp3_read_probe(AVProbeData *p)
     // issues with MPEG-files!
     if   (first_frames>=4) return AVPROBE_SCORE_EXTENSION + 1;
     else if(max_frames>200)return AVPROBE_SCORE_EXTENSION;
-    else if(max_frames>=4) return AVPROBE_SCORE_EXTENSION / 2;
+    else if(max_frames>=4 && max_frames >= p->buf_size/10000) return AVPROBE_SCORE_EXTENSION / 2;
     else if(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC) && 2*ff_id3v2_tag_len(buf0) >= p->buf_size)
                            return p->buf_size < PROBE_BUF_MAX ? AVPROBE_SCORE_EXTENSION / 4 : AVPROBE_SCORE_EXTENSION - 2;
-    else if(max_frames>=1) return 1;
+    else if(max_frames>=1 && max_frames >= p->buf_size/10000) return 1;
     else                   return 0;
 //mpegps_mp3_unrecognized_format.mpg has max_frames=3
 }