qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 20:30:04 -07:00
Code Releases Activity

archive/zip: make receiver names consistent

Browse Source
This commit is contained in:
Oleksandr Redko 2023-02-11 21:30:03 +02:00
parent 261fe25c83
commit dd7315b09d
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/archive/zip/reader.go
View File

@ -121,25 +121,25 @@ func NewReader(r io.ReaderAt, size int64) (*Reader, error) {
return zr, nil return zr, nil
} }
func (z *Reader) init(r io.ReaderAt, size int64) error { func (r *Reader) init(rdr io.ReaderAt, size int64) error {
end, baseOffset, err := readDirectoryEnd(r, size) end, baseOffset, err := readDirectoryEnd(rdr, size)
if err != nil { if err != nil {
return err return err
} }
z.r = r r.r = rdr
z.baseOffset = baseOffset r.baseOffset = baseOffset
// Since the number of directory records is not validated, it is not // Since the number of directory records is not validated, it is not
// safe to preallocate z.File without first checking that the specified // safe to preallocate r.File without first checking that the specified
// number of files is reasonable, since a malformed archive may // number of files is reasonable, since a malformed archive may
// indicate it contains up to 1 << 128 - 1 files. Since each file has a // 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 // header which will be _at least_ 30 bytes we can safely preallocate
// if (data size / 30) >= end.directoryRecords. // if (data size / 30) >= end.directoryRecords.
if end.directorySize < uint64(size) && (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) r.File = make([]*File, 0, end.directoryRecords)
} }
z.Comment = end.comment r.Comment = end.comment
rs := io.NewSectionReader(r, 0, size) rs := io.NewSectionReader(rdr, 0, size)
if _, err = rs.Seek(z.baseOffset+int64(end.directoryOffset), io.SeekStart); err != nil { if _, err = rs.Seek(r.baseOffset+int64(end.directoryOffset), io.SeekStart); err != nil {
return err return err
} }
buf := bufio.NewReader(rs) buf := bufio.NewReader(rs)
@ -149,7 +149,7 @@ func (z *Reader) init(r io.ReaderAt, size int64) error {
// a bad one, and then only report an ErrFormat or UnexpectedEOF if // a bad one, and then only report an ErrFormat or UnexpectedEOF if
// the file count modulo 65536 is incorrect. // the file count modulo 65536 is incorrect.
for { for {
f := &File{zip: z, zipr: r} f := &File{zip: r, zipr: rdr}
err = readDirectoryHeader(f, buf) err = readDirectoryHeader(f, buf)
if err == ErrFormat || err == io.ErrUnexpectedEOF { if err == ErrFormat || err == io.ErrUnexpectedEOF {
break break
@ -157,10 +157,10 @@ func (z *Reader) init(r io.ReaderAt, size int64) error {
if err != nil { if err != nil {
return err return err
} }
f.headerOffset += z.baseOffset f.headerOffset += r.baseOffset
z.File = append(z.File, f) r.File = append(r.File, f)
} }
if uint16(len(z.File)) != uint16(end.directoryRecords) { // only compare 16 bits here if uint16(len(r.File)) != uint16(end.directoryRecords) { // only compare 16 bits here
// Return the readDirectoryHeader error if we read // Return the readDirectoryHeader error if we read
// the wrong number of directory entries. // the wrong number of directory entries.
return err return err
@ -171,15 +171,15 @@ func (z *Reader) init(r io.ReaderAt, size int64) error {
// RegisterDecompressor registers or overrides a custom decompressor for a // RegisterDecompressor registers or overrides a custom decompressor for a
// specific method ID. If a decompressor for a given method is not found, // specific method ID. If a decompressor for a given method is not found,
// Reader will default to looking up the decompressor at the package level. // Reader will default to looking up the decompressor at the package level.
func (z *Reader) RegisterDecompressor(method uint16, dcomp Decompressor) { func (r *Reader) RegisterDecompressor(method uint16, dcomp Decompressor) {
if z.decompressors == nil { if r.decompressors == nil {
z.decompressors = make(map[uint16]Decompressor) r.decompressors = make(map[uint16]Decompressor)
} }
z.decompressors[method] = dcomp r.decompressors[method] = dcomp
} }
func (z *Reader) decompressor(method uint16) Decompressor { func (r *Reader) decompressor(method uint16) Decompressor {
dcomp := z.decompressors[method] dcomp := r.decompressors[method]
if dcomp == nil { if dcomp == nil {
dcomp = decompressor(method) dcomp = decompressor(method)
} }
@ -740,14 +740,14 @@ type fileInfoDirEntry interface {
fs.DirEntry fs.DirEntry
} }
func (e *fileListEntry) stat() (fileInfoDirEntry, error) { func (f *fileListEntry) stat() (fileInfoDirEntry, error) {
if e.isDup { if f.isDup {
return nil, errors.New(e.name + ": duplicate entries in zip file") return nil, errors.New(f.name + ": duplicate entries in zip file")
} }
if !e.isDir { if !f.isDir {
return headerFileInfo{&e.file.FileHeader}, nil return headerFileInfo{&f.file.FileHeader}, nil
} }
return e, nil return f, nil
} }
// Only used for directories. // Only used for directories.

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

@ -338,8 +338,8 @@ func (h *FileHeader) isZip64() bool {
return h.CompressedSize64 >= uint32max || h.UncompressedSize64 >= uint32max return h.CompressedSize64 >= uint32max || h.UncompressedSize64 >= uint32max
} }
func (f *FileHeader) hasDataDescriptor() bool { func (h *FileHeader) hasDataDescriptor() bool {
return f.Flags&0x8 != 0 return h.Flags&0x8 != 0
} }
func msdosModeToFileMode(m uint32) (mode fs.FileMode) { func msdosModeToFileMode(m uint32) (mode fs.FileMode) {