wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-11-23 18:56:52 +03:00
Code Issues Projects Releases Wiki Activity

flac_frame: Fail if trying to decode outside block size

Browse Source
This commit is contained in:
Mattias Wadman 2021-10-20 13:55:34 +02:00
parent 4af5739712
commit bc9951cc59
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
format/flac/flac_frame.go
View File

@ -413,6 +413,10 @@ func frameDecode(d *decode.D, in interface{}) interface{} {
d.FieldValueU("subframe_sample_size", uint64(subframeSampleSize), "") d.FieldValueU("subframe_sample_size", uint64(subframeSampleSize), "")
decodeWarmupSamples := func(samples []int64, n int, sampleSize int) { decodeWarmupSamples := func(samples []int64, n int, sampleSize int) {
if len(samples) < n {
d.Invalid("decodeWarmupSamples outside block size")
}
d.FieldArrayFn("warmup_samples", func(d *decode.D) { d.FieldArrayFn("warmup_samples", func(d *decode.D) {
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
samples[i] = d.FieldS("value", sampleSize) samples[i] = d.FieldS("value", sampleSize)
@ -421,6 +425,7 @@ func frameDecode(d *decode.D, in interface{}) interface{} {
} }
decodeResiduals := func(samples []int64) { decodeResiduals := func(samples []int64) {
samplesLen := len(samples)
n := 0 n := 0
// <2> Residual coding method: // <2> Residual coding method:
@ -475,6 +480,11 @@ func frameDecode(d *decode.D, in interface{}) interface{} {
d.FieldValueU("count", uint64(count), "") d.FieldValueU("count", uint64(count), "")
riceParameter := int(d.FieldU("rice_parameter", riceBits)) riceParameter := int(d.FieldU("rice_parameter", riceBits))
if samplesLen < n+count {
d.Invalid("decodeResiduals outside block size")
}
if riceParameter == riceEscape { if riceParameter == riceEscape {
escapeSampleSize := int(d.FieldU5("escape_sample_size")) escapeSampleSize := int(d.FieldU5("escape_sample_size"))
d.FieldBitBufLen("samples", int64(count*escapeSampleSize)) d.FieldBitBufLen("samples", int64(count*escapeSampleSize))