refactor: simplify overflow check

SpencerTorres · SpencerTorres · commit b64209fc5e8d · 2025-02-14T13:49:12.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,6 @@
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
+
+# Editors
+.idea/
diff --git a/compress/writer.go b/compress/writer.go
@@ -58,9 +58,8 @@ func (w *Writer) Compress(m Method, buf []byte) error {
 		n = copy(w.Data[headerSize:], buf)
 	}
 
-	if n+headerSize > cap(w.Data) {
-		return errors.New("compressed data exceeds allocated buffer capacity")
-	} else if uint64(n)+uint64(compressHeaderSize) > math.MaxUint32 {
+	// security: https://github.com/ClickHouse/ch-go/pull/1041
+	if uint64(n)+uint64(compressHeaderSize) > math.MaxUint32 {
 		return errors.New("compressed size overflows uint32")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,8 @@ func (w *Writer) Compress(m Method, buf []byte) error {`
`58`	`58`	`n = copy(w.Data[headerSize:], buf)`
`59`	`59`	`}`
`60`	`60`
`61`		`- if n+headerSize > cap(w.Data) {`
`62`		`- return errors.New("compressed data exceeds allocated buffer capacity")`
`63`		`- } else if uint64(n)+uint64(compressHeaderSize) > math.MaxUint32 {`
	`61`	`+ // security: https://github.com/ClickHouse/ch-go/pull/1041`
	`62`	`+ if uint64(n)+uint64(compressHeaderSize) > math.MaxUint32 {`
`64`	`63`	`return errors.New("compressed size overflows uint32")`
`65`	`64`	`}`
`66`	`65`