s2: Fix incorrect length encoded by writer.AddSkippableBlock (#917)

Jille · web-flow · commit 6ac58c95d96e · 2024-01-25T16:19:44.000+01:00
diff --git a/s2/writer.go b/s2/writer.go
@@ -273,7 +273,7 @@ func (w *Writer) AddSkippableBlock(id uint8, data []byte) (err error) {
 		return fmt.Errorf("skippable block excessed maximum size")
 	}
 	var header [4]byte
-	chunkLen := 4 + len(data)
+	chunkLen := len(data)
 	header[0] = id
 	header[1] = uint8(chunkLen >> 0)
 	header[2] = uint8(chunkLen >> 8)

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ func (w *Writer) AddSkippableBlock(id uint8, data []byte) (err error) {`
`273`	`273`	`return fmt.Errorf("skippable block excessed maximum size")`
`274`	`274`	`}`
`275`	`275`	`var header [4]byte`
`276`		`- chunkLen := 4 + len(data)`
	`276`	`+ chunkLen := len(data)`
`277`	`277`	`header[0] = id`
`278`	`278`	`header[1] = uint8(chunkLen >> 0)`
`279`	`279`	`header[2] = uint8(chunkLen >> 8)`