diff options
| author | Heschi Kreinick <heschi@google.com> | 2021-10-07 19:02:56 -0400 |
|---|---|---|
| committer | Heschi Kreinick <heschi@google.com> | 2021-10-07 19:02:56 -0400 |
| commit | 35d5cd0dcfb9d06064ec37da1621d24676454058 (patch) | |
| tree | 5319064d4c2970a6d3be069b9c2a0e273f0f14dd /src/archive/zip/reader.go | |
| parent | 0d02a0d966b6d307ac33e3df3687948b74408569 (diff) | |
| parent | c580180744e60d6c84fc0b59d634fcff01290780 (diff) | |
| download | go-35d5cd0dcfb9d06064ec37da1621d24676454058.tar.gz go-35d5cd0dcfb9d06064ec37da1621d24676454058.zip | |
[dev.boringcrypto.go1.16] all: merge go1.16.9 into dev.boringcrypto.go1.16
Change-Id: Ic26e9802fe13c491fcc26f34b8847779ac43cfe2
Diffstat (limited to 'src/archive/zip/reader.go')
| -rw-r--r-- | src/archive/zip/reader.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/archive/zip/reader.go b/src/archive/zip/reader.go index ddef2b7b5a..801d1313b6 100644 --- a/src/archive/zip/reader.go +++ b/src/archive/zip/reader.go @@ -105,7 +105,7 @@ func (z *Reader) init(r io.ReaderAt, size int64) error { // indicate it contains up to 1 << 128 - 1 files. Since each file has a // header which will be _at least_ 30 bytes we can safely preallocate // if (data size / 30) >= end.directoryRecords. - if (uint64(size)-end.directorySize)/30 >= end.directoryRecords { + if end.directorySize < uint64(size) && (uint64(size)-end.directorySize)/30 >= end.directoryRecords { z.File = make([]*File, 0, end.directoryRecords) } z.Comment = end.comment |