Merge pull request #159 from oschwald/greg/fix-overflow

oschwald · web-flow · commit acf1f2c2bdae · 2024-12-31T12:31:04.000-08:00
Prevent overflow on 32-bit CPU
diff --git a/reader.go b/reader.go
@@ -65,7 +65,7 @@ func FromBytes(buffer []byte) (*Reader, error) {
 		return nil, err
 	}
 
-	searchTreeSize := metadata.NodeCount * metadata.RecordSize / 4
+	searchTreeSize := metadata.NodeCount * (metadata.RecordSize / 4)
 	dataSectionStart := searchTreeSize + dataSectionSeparatorSize
 	dataSectionEnd := uint(metadataStart - len(metadataStartMarker))
 	if dataSectionStart > dataSectionEnd {
diff --git a/reader_test.go b/reader_test.go
@@ -823,7 +823,7 @@ func BenchmarkOpen(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		db, err = Open("GeoLite2-City.mmdb")
 		if err != nil {
-			b.Error(err)
+			b.Fatal(err)
 		}
 	}
 	assert.NotNil(b, db)

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func FromBytes(buffer []byte) (*Reader, error) {`
`65`	`65`	`return nil, err`
`66`	`66`	`}`
`67`	`67`
`68`		`- searchTreeSize := metadata.NodeCount * metadata.RecordSize / 4`
	`68`	`+ searchTreeSize := metadata.NodeCount * (metadata.RecordSize / 4)`
`69`	`69`	`dataSectionStart := searchTreeSize + dataSectionSeparatorSize`
`70`	`70`	`dataSectionEnd := uint(metadataStart - len(metadataStartMarker))`
`71`	`71`	`if dataSectionStart > dataSectionEnd {`
Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,7 @@ func BenchmarkOpen(b *testing.B) {`
`823`	`823`	`for i := 0; i < b.N; i++ {`
`824`	`824`	`db, err = Open("GeoLite2-City.mmdb")`
`825`	`825`	`if err != nil {`
`826`		`- b.Error(err)`
	`826`	`+ b.Fatal(err)`
`827`	`827`	`}`
`828`	`828`	`}`
`829`	`829`	`assert.NotNil(b, db)`