be sure part size doesn't overflow

kr · kr · commit 0e5793e038b1 · 2013-05-30T18:42:14.000-07:00
diff --git a/s3util/uploader.go b/s3util/uploader.go
@@ -41,7 +41,7 @@ type uploader struct {
 	url      string
 	UploadId string // written by xml decoder
 
-	bufsz  int
+	bufsz  int64
 	buf    []byte
 	off    int
 	ch     chan *part
@@ -117,7 +117,7 @@ func (u *uploader) Write(p []byte) (n int, err error) {
 	}
 	for n < len(p) {
 		if cap(u.buf) == 0 {
-			u.buf = make([]byte, u.bufsz)
+			u.buf = make([]byte, int(u.bufsz))
 			// Increase part size (1.001x).
 			// This lets us reach the max object size (5TiB) while
 			// still doing minimal buffering for small objects.
@@ -248,7 +248,7 @@ func (u *uploader) abort() {
 	}
 }
 
-func min(a, b int) int {
+func min(a, b int64) int64 {
 	if a < b {
 		return a
 	}

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ type uploader struct {`
`41`	`41`	`url string`
`42`	`42`	`UploadId string // written by xml decoder`
`43`	`43`
`44`		`- bufsz int`
	`44`	`+ bufsz int64`
`45`	`45`	`buf []byte`
`46`	`46`	`off int`
`47`	`47`	`ch chan *part`
`@@ -117,7 +117,7 @@ func (u *uploader) Write(p []byte) (n int, err error) {`
`117`	`117`	`}`
`118`	`118`	`for n < len(p) {`
`119`	`119`	`if cap(u.buf) == 0 {`
`120`		`- u.buf = make([]byte, u.bufsz)`
	`120`	`+ u.buf = make([]byte, int(u.bufsz))`
`121`	`121`	`// Increase part size (1.001x).`
`122`	`122`	`// This lets us reach the max object size (5TiB) while`
`123`	`123`	`// still doing minimal buffering for small objects.`
`@@ -248,7 +248,7 @@ func (u *uploader) abort() {`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`
`251`		`-func min(a, b int) int {`
	`251`	`+func min(a, b int64) int64 {`
`252`	`252`	`if a < b {`
`253`	`253`	`return a`
`254`	`254`	`}`