From 5a6c2d9f3b10e369db5a9da30c6594f32e7f5056 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 20 Apr 2025 23:12:17 +0530
Subject: [PATCH] skip illegal paths in tar archives rather than erroring on
 them

---
 tools/utils/tar.go | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tools/utils/tar.go b/tools/utils/tar.go
index 75cee92c9..9b6cf6ece 100644
--- a/tools/utils/tar.go
+++ b/tools/utils/tar.go
@@ -68,7 +68,7 @@ func ExtractAllFromTar(tr *tar.Reader, dest_path string, optss ...TarExtractOpti
 			}
 		}
 		if !strings.HasPrefix(filepath.Clean(dest), filepath.Clean(dest_path)+string(os.PathSeparator)) {
-			return count, fmt.Errorf("illegal path in tar archive: %s", hdr.Name)
+			continue
 		}
 		switch hdr.Typeflag {
 		case tar.TypeDir:
@@ -99,7 +99,15 @@ func ExtractAllFromTar(tr *tar.Reader, dest_path string, optss ...TarExtractOpti
 			if err = os.MkdirAll(filepath.Dir(dest), 0o700); err != nil {
 				return
 			}
-			if err = os.Link(hdr.Linkname, dest); err != nil {
+			link_target := hdr.Linkname
+			if !filepath.IsAbs(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 {
 				return
 			}
 			if err = set_metadata(func(m fs.FileMode) error { return os.Chmod(dest, m) }, hdr); err != nil {
@@ -115,7 +123,7 @@ func ExtractAllFromTar(tr *tar.Reader, dest_path string, optss ...TarExtractOpti
 			}
 			// Ensure the symlink target is within the destination directory
 			if !strings.HasPrefix(filepath.Clean(link_target), filepath.Clean(dest_path)+string(os.PathSeparator)) {
-				return count, fmt.Errorf("illegal symlink target: %s -> %s", hdr.Name, link_target)
+				continue
 			}
 			if err = os.Symlink(link_target, dest); err != nil {
 				return