Merge pull request #311 from zachjs/v2

niemeyer · web-flow · commit 3f83fa500528 · 2016-08-17T23:01:20.000-03:00
Fix integer constant overflow on 32-bit systems.
diff --git a/bson/json.go b/bson/json.go
@@ -317,7 +317,7 @@ func jencNumberLong(v interface{}) ([]byte, error) {
 func jencInt(v interface{}) ([]byte, error) {
 	n := v.(int)
 	f := `{"$numberLong":"%d"}`
-	if n <= 1<<53 {
+	if int64(n) <= 1<<53 {
 		f = `%d`
 	}
 	return fbytes(f, n), nil

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ func jencNumberLong(v interface{}) ([]byte, error) {`
`317`	`317`	`func jencInt(v interface{}) ([]byte, error) {`
`318`	`318`	`n := v.(int)`
`319`	`319`	f := `{"$numberLong":"%d"}`
`320`		`- if n <= 1<<53 {`
	`320`	`+ if int64(n) <= 1<<53 {`
`321`	`321`	f = `%d`
`322`	`322`	`}`
`323`	`323`	`return fbytes(f, n), nil`