Belac/squashfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 55 Wiki Activity

fix: handle paths with special characters

Browse Source 
Use direct comparison of filenames rather than path.Match, which gives
characters such as '[' special meaning, resulting in unexpected failures
when calling Open, ReadDir, Stat, or Sub.
This commit is contained in:
Adam Hughes
2022-04-22 05:02:57 +00:00
parent 6ada4f3b49
commit a908d69987
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reader_fs.go
+4 -4
View File
@@ -50,7 +50,7 @@ func (f FS) Open(name string) (fs.File, error) {
return &File{i: f.i, r: f.r, parent: f.parent, name: f.name}, nil return &File{i: f.i, r: f.r, parent: f.parent, name: f.name}, nil
} }
for i := 0; i < len(f.entries); i++ { for i := 0; i < len(f.entries); i++ {
if match, _ := path.Match(split[0], f.entries[i].Name); match { if split[0] == f.entries[i].Name {
if len(split) == 1 { if len(split) == 1 {
return f.r.newFileFromDirEntry(f.entries[i], &f) return f.r.newFileFromDirEntry(f.entries[i], &f)
} }
@@ -193,7 +193,7 @@ func (f FS) ReadDir(name string) ([]fs.DirEntry, error) {
return f.ReadDir(-1) return f.ReadDir(-1)
} }
for i := 0; i < len(f.entries); i++ { for i := 0; i < len(f.entries); i++ {
if match, _ := path.Match(split[0], f.entries[i].Name); match { if split[0] == f.entries[i].Name {
if len(split) == 1 { if len(split) == 1 {
in, err := f.r.getInodeFromEntry(f.entries[i]) in, err := f.r.getInodeFromEntry(f.entries[i])
if err != nil { if err != nil {
@@ -313,7 +313,7 @@ func (f FS) Stat(name string) (fs.FileInfo, error) {
return f.Stat() return f.Stat()
} }
for i := 0; i < len(f.entries); i++ { for i := 0; i < len(f.entries); i++ {
if match, _ := path.Match(split[0], f.entries[i].Name); match { if split[0] == f.entries[i].Name {
if len(split) == 1 { if len(split) == 1 {
in, err := f.r.getInodeFromEntry(f.entries[i]) in, err := f.r.getInodeFromEntry(f.entries[i])
if err != nil { if err != nil {
@@ -399,7 +399,7 @@ func (f FS) Sub(dir string) (fs.FS, error) {
return f, nil return f, nil
} }
for i := 0; i < len(f.entries); i++ { for i := 0; i < len(f.entries); i++ {
if match, _ := path.Match(split[0], f.entries[i].Name); match { if split[0] == f.entries[i].Name {
if len(split) == 1 { if len(split) == 1 {
in, err := f.r.getInodeFromEntry(f.entries[i]) in, err := f.r.getInodeFromEntry(f.entries[i])
if err != nil { if err != nil {