cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-29 03:11:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

archive/zip: fix casting overflow on 32-bit arch

Browse Source 
Fixes #29555

Change-Id: Ia3c0dd65bcf94dea3f6e04c23c1fe5d6d0b2c1e9
Reviewed-on: https://go-review.googlesource.com/c/156399
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
LE Manh Cuong 2019-01-05 23:39:24 +07:00 committed by Brad Fitzpatrick
parent 11847cb8e0
commit f7248ba753
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/archive/zip/zip_test.go
View File

@ -159,7 +159,7 @@ func (r *rleBuffer) Write(p []byte) (n int, err error) {
return len(p), nil return len(p), nil
} }
func min(x, y int) int { func min(x, y int64) int64 {
if x < y { if x < y {
return x return x
} }
@ -190,7 +190,7 @@ func (r *rleBuffer) ReadAt(p []byte, off int64) (n int, err error) {
if len(parts) > 0 { if len(parts) > 0 {
skipBytes := off - parts[0].off skipBytes := off - parts[0].off
for _, part := range parts { for _, part := range parts {
repeat := min(int(part.n-skipBytes), len(p)-n) repeat := int(min(part.n-skipBytes, int64(len(p)-n)))
memset(p[n:n+repeat], part.b) memset(p[n:n+repeat], part.b)
n += repeat n += repeat
if n == len(p) { if n == len(p) {