mirror
/
afero
mirror of https://github.com/spf13/afero.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Work around root directory Open/Stat corner case leading to panic 

See https://github.com/spf13/afero/pull/146#issuecomment-470840725
This commit is contained in:
Hilko Bengen 2019-03-11 19:00:04 +01:00
parent 4f00b06400
commit d5bfeca89b
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zipfs/file.go
View File

@ -148,7 +148,12 @@ func (f *File) Readdirnames(count int) (names []string, err error) {
return return
} }
func (f *File) Stat() (os.FileInfo, error) { return f.zipfile.FileInfo(), nil } func (f *File) Stat() (os.FileInfo, error) {
if f.zipfile == nil {
return &pseudoRoot{}, nil
}
return f.zipfile.FileInfo(), nil
}
func (f *File) Sync() error { return nil } func (f *File) Sync() error { return nil }

12
zipfs/zipfs_test.go
View File

@ -38,6 +38,17 @@ func TestZipFS(t *testing.T) {
t.Errorf("expected to get <aaaabbbb>, got <%s>", string(buf)) t.Errorf("expected to get <aaaabbbb>, got <%s>", string(buf))
} }
d, err := a.Open("/")
if d == nil {
t.Error(`Open("/") returns nil`)
}
if err != nil {
t.Errorf(`Open("/"): err = %v`, err)
}
if s, _ := d.Stat(); !s.IsDir() {
t.Error(`expected root ("/") to be a directory`)
}
buf = make([]byte, 8192) buf = make([]byte, 8192)
if n, err := f.Read(buf); err != nil { if n, err := f.Read(buf); err != nil {
t.Error(err) t.Error(err)
@ -51,6 +62,7 @@ func TestZipFS(t *testing.T) {
path string path string
dir bool dir bool
}{ }{
{"/", true},
{"testDir1", true}, {"testDir1", true},
{"testDir1/testFile", false}, {"testDir1/testFile", false},
{"testFile", false}, {"testFile", false},