Fix 32 bit builds (#129)

klauspost · Jun 17, 2019 · 4dbb2ac · 4dbb2ac
1 parent 0b31f26
commit 4dbb2ac
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,7 @@ script:
  - go test -cpu=2 -tags=noasm ./...
  - go test -cpu=1,2,4 -short -race ./...
  - go test -cpu=2,4 -short -race -tags=noasm ./...
+ - GOOS=linux GOARCH=386 go install ./...
 
 matrix:
   allow_failures:

diff --git a/fse/compress.go b/fse/compress.go
@@ -19,7 +19,7 @@ func Compress(in []byte, s *Scratch) ([]byte, error) {
 	if len(in) <= 1 {
 		return nil, ErrIncompressible
 	}
-	if len(in) >= 2<<30 {
+	if len(in) > (2<<30)-1 {
 		return nil, errors.New("input too big, must be < 2GB")
 	}
 	s, err := s.prepare(in)

diff --git a/fse/fse.go b/fse/fse.go
@@ -127,7 +127,7 @@ func (s *Scratch) prepare(in []byte) (*Scratch, error) {
 	s.br.init(in)
 	if s.DecompressLimit == 0 {
 		// Max size 2GB.
-		s.DecompressLimit = 2 << 30
+		s.DecompressLimit = (2 << 30) - 1
 	}
 
 	return s, nil

diff --git a/zstd/frameenc.go b/zstd/frameenc.go
@@ -105,7 +105,7 @@ func skippableFrame(dst []byte, total int, r io.Reader) ([]byte, error) {
 	if total < skippableFrameHeader {
 		return dst, fmt.Errorf("requested skippable frame (%d) < 8", total)
 	}
-	if total > math.MaxUint32 {
+	if int64(total) > math.MaxUint32 {
 		return dst, fmt.Errorf("requested skippable frame (%d) > max uint32", total)
 	}
 	dst = append(dst, 0x50, 0x2a, 0x4d, 0x18)