Fix for buffer overflow

Jason Crawford · Jason Crawford · commit 1b6e43a4695e · 2021-03-16T19:51:27.000-07:00
diff --git a/mixing/mixer.go b/mixing/mixer.go
@@ -68,16 +68,20 @@ func (m *Mixer) FlattenTo(resultBuffers [][]byte, panmixer PanMixer, samplesLen
 	data := m.NewMixBuffer(samplesLen)
 	for _, rdata := range row {
 		pos := 0
+		maxLen := 0
 		for _, cdata := range rdata {
 			if cdata.Flush != nil {
 				cdata.Flush()
 			}
+			if maxLen < cdata.SamplesLen {
+				maxLen = cdata.SamplesLen
+			}
 			if len(cdata.Data) > 0 {
 				volMtx := cdata.Volume.Apply(panmixer.GetMixingMatrix(cdata.Pan)...)
 				data.Add(pos, cdata.Data, volMtx)
 			}
-			pos += cdata.SamplesLen
 		}
+		pos += maxLen
 	}
 	data.ToRenderDataWithBufs(resultBuffers, samplesLen, m.BitsPerSample, mixerVolume)
 }

Original file line number	Diff line number	Diff line change
`@@ -68,16 +68,20 @@ func (m *Mixer) FlattenTo(resultBuffers [][]byte, panmixer PanMixer, samplesLen`
`68`	`68`	`data := m.NewMixBuffer(samplesLen)`
`69`	`69`	`for _, rdata := range row {`
`70`	`70`	`pos := 0`
	`71`	`+ maxLen := 0`
`71`	`72`	`for _, cdata := range rdata {`
`72`	`73`	`if cdata.Flush != nil {`
`73`	`74`	`cdata.Flush()`
`74`	`75`	`}`
	`76`	`+ if maxLen < cdata.SamplesLen {`
	`77`	`+ maxLen = cdata.SamplesLen`
	`78`	`+ }`
`75`	`79`	`if len(cdata.Data) > 0 {`
`76`	`80`	`volMtx := cdata.Volume.Apply(panmixer.GetMixingMatrix(cdata.Pan)...)`
`77`	`81`	`data.Add(pos, cdata.Data, volMtx)`
`78`	`82`	`}`
`79`		`- pos += cdata.SamplesLen`
`80`	`83`	`}`
	`84`	`+ pos += maxLen`
`81`	`85`	`}`
`82`	`86`	`data.ToRenderDataWithBufs(resultBuffers, samplesLen, m.BitsPerSample, mixerVolume)`
`83`	`87`	`}`