mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 14:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary check

Browse Source
This commit is contained in:
Kovid Goyal
2025-04-20 23:36:42 +05:30
parent 50b830faa5
commit 3daac6fb22
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/utils/tar.go
View File

@@ -103,10 +103,6 @@ func ExtractAllFromTar(tr *tar.Reader, dest_path string, optss ...TarExtractOpti
if !filepath.IsAbs(link_target) { if !filepath.IsAbs(link_target) {
link_target = filepath.Join(filepath.Dir(dest), link_target) link_target = filepath.Join(filepath.Dir(dest), link_target)
} }
// Ensure the symlink target is within the destination directory
if !strings.HasPrefix(filepath.Clean(link_target), filepath.Clean(dest_path)+string(os.PathSeparator)) {
continue
}
if err = os.Link(link_target, dest); err != nil { if err = os.Link(link_target, dest); err != nil {
return return
} }
@@ -121,10 +117,9 @@ func ExtractAllFromTar(tr *tar.Reader, dest_path string, optss ...TarExtractOpti
if !filepath.IsAbs(link_target) { if !filepath.IsAbs(link_target) {
link_target = filepath.Join(filepath.Dir(dest), link_target) link_target = filepath.Join(filepath.Dir(dest), link_target)
} }
// Ensure the symlink target is within the destination directory // We dont care about the link target being outside dest_path as
if !strings.HasPrefix(filepath.Clean(link_target), filepath.Clean(dest_path)+string(os.PathSeparator)) { // we use EvalSymlinks on dest, so a symlink pointing outside
continue // dest_path cannot cause writes outside dest_path.
}
if err = os.Symlink(link_target, dest); err != nil { if err = os.Symlink(link_target, dest); err != nil {
return return
} }