Merge pull request #1562 from sevmonster/patch-1

the-djmaze · web-flow · commit 0c081cf9aae1 · 2024-04-28T14:45:46.000+02:00
Properly escape path separator in `tar.php` file list regex
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/tar.php b/snappymail/v/0.0.0/app/libraries/snappymail/tar.php
@@ -29,7 +29,7 @@ public function extractTo(string $directory, $files = null, bool $overwrite = fa
 		}
 
 		if ($files) {
-			$files = '/^(' . \implode('|', \array_map('preg_quote', \is_array($files) ? $files : [$files])) . ')/u';
+			$files = '/^(' . \implode('|', \array_map(fn($x): string => preg_quote($x, '/'), \is_array($files) ? $files : [$files])) . ')/u';
 		}
 
 		\clearstatcache(true);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function extractTo(string $directory, $files = null, bool $overwrite = fa`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`if ($files) {`
`32`		`- $files = '/^(' . \implode('\|', \array_map('preg_quote', \is_array($files) ? $files : [$files])) . ')/u';`
	`32`	`+ $files = '/^(' . \implode('\|', \array_map(fn($x): string => preg_quote($x, '/'), \is_array($files) ? $files : [$files])) . ')/u';`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`\clearstatcache(true);`