Correctly handling backslashes in ZIP file entries.

ReCodEx · Dec 16, 2024 · b7541f8 · b7541f8
1 parent eff5954
commit b7541f8
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/app/helpers/FileStorage/LocalStorage/LocalFileStorage.php b/app/helpers/FileStorage/LocalStorage/LocalFileStorage.php
@@ -81,13 +81,11 @@ private static function normalizePath(string $path): string
      */
     private function decodePath(string &$path, bool $exists = null, $mkdir = false): array
     {
-        $path = self::normalizePath($path);
-
         $tokens = explode('#', $path, 2);
         array_push($tokens, null); // make sure second item always exists
         [$realPath, $zipEntry] = $tokens;
 
-        $realPath = $this->rootDirectory . '/' . $realPath;
+        $realPath = $this->rootDirectory . '/' . self::normalizePath($realPath);
         if (is_dir($realPath)) {
             throw new FileStorageException("Given path refers to a directory.", $path);
         }