wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-12-23 13:22:58 +03:00
Code Issues Projects Releases Wiki Activity

mp3: Don't allow more than 64k between frames

Browse Source 
Should rethink this
This commit is contained in:
Mattias Wadman 2021-11-21 12:02:40 +01:00
parent 9029143acc
commit 046f2fd965
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
format/mp3/mp3.go
View File

@ -14,6 +14,10 @@ var headerFormat decode.Group
var footerFormat decode.Group var footerFormat decode.Group
var mp3Frame decode.Group var mp3Frame decode.Group
// TODO: format options default
const maxUniqueHeaderConfigs = 5
const maxSyncSeek = 64 * 1024 * 8
func init() { func init() {
registry.MustRegister(decode.Format{ registry.MustRegister(decode.Format{
Name: format.MP3, Name: format.MP3,
@ -62,12 +66,12 @@ func mp3Decode(d *decode.D, in interface{}) interface{} {
decodeFailures := 0 decodeFailures := 0
d.FieldArray("frames", func(d *decode.D) { d.FieldArray("frames", func(d *decode.D) {
for d.NotEnd() { for d.NotEnd() {
syncLen, _, err := d.TryPeekFind(16, 8, -1, func(v uint64) bool { syncLen, _, err := d.TryPeekFind(16, 8, maxSyncSeek, func(v uint64) bool {
return (v&0b1111_1111_1110_0000 == 0b1111_1111_1110_0000 && // sync header return (v&0b1111_1111_1110_0000 == 0b1111_1111_1110_0000 && // sync header
v&0b0000_0000_0001_1000 != 0b0000_0000_0000_1000 && // not reserved mpeg version v&0b0000_0000_0001_1000 != 0b0000_0000_0000_1000 && // not reserved mpeg version
v&0b0000_0000_0000_0110 == 0b0000_0000_0000_0010) // layer 3 v&0b0000_0000_0000_0110 == 0b0000_0000_0000_0010) // layer 3
}) })
if err != nil { if err != nil || syncLen < 0 {
break break
} }
if syncLen > 0 { if syncLen > 0 {
@ -95,7 +99,7 @@ func mp3Decode(d *decode.D, in interface{}) interface{} {
lastValidEnd = d.Pos() lastValidEnd = d.Pos()
validFrames++ validFrames++
if len(uniqueHeaderConfigs) > 5 { if len(uniqueHeaderConfigs) >= maxUniqueHeaderConfigs {
d.Errorf("too many unique header configurations") d.Errorf("too many unique header configurations")
} }
} }