From: Anthony Martin <ality@pbrane.org>
Date: Sun, 5 Sep 2010 22:04:53 +0000 (+1000)
Subject: fmt.Scan: fix integer overflow on 32-bit machines
X-Git-Tag: weekly.2010-09-06~2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=68cce4ab206586267fcfa9ac4ef3dc8396054e94;p=gostls13.git

fmt.Scan: fix integer overflow on 32-bit machines

R=r, rsc
CC=golang-dev
https://golang.org/cl/2144043
---

diff --git a/src/pkg/fmt/scan.go b/src/pkg/fmt/scan.go
index afbbeb3948..bd8af50069 100644
--- a/src/pkg/fmt/scan.go
+++ b/src/pkg/fmt/scan.go
@@ -740,7 +740,7 @@ func (s *ss) scanOne(verb int, field interface{}) {
 	case *int32:
 		*v = int32(s.scanInt(verb, 32))
 	case *int64:
-		*v = s.scanInt(verb, intBits)
+		*v = s.scanInt(verb, 64)
 	case *uint:
 		*v = uint(s.scanUint(verb, intBits))
 	case *uint8:
diff --git a/src/pkg/fmt/scan_test.go b/src/pkg/fmt/scan_test.go
index 9092789897..569d2f55f3 100644
--- a/src/pkg/fmt/scan_test.go
+++ b/src/pkg/fmt/scan_test.go
@@ -183,6 +183,9 @@ var scanTests = []ScanTest{
 
 	// Custom scanner.
 	ScanTest{"  vvv ", &xVal, Xs("vvv")},
+
+	// Fixed bugs
+	ScanTest{"2147483648\n", &int64Val, int64(2147483648)}, // was: integer overflow
 }
 
 var scanfTests = []ScanfTest{