Avoid emptying the directory before extracting an archive into it, ch…

…eck that it is empty instead
composer · Mar 28, 2020 · 7325169 · 7325169 · Seldaek · Jun 17, 2020
1 parent 6679dde
commit 7325169
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Composer/Downloader/ArchiveDownloader.php b/src/Composer/Downloader/ArchiveDownloader.php
@@ -38,7 +38,10 @@ public function install(PackageInterface $package, $path, $output = true)
             $this->io->writeError('Extracting archive', false);
         }
 
-        $this->filesystem->emptyDirectory($path);
+        $this->filesystem->ensureDirectoryExists($path);
+        if (!$this->filesystem->isDirEmpty($path)) {
+            throw new \RuntimeException('Expected empty path to extract '.$package.' into but directory exists: '.$path);
+        }
 
         $temporaryDir = $this->config->get('vendor-dir').'/composer/'.substr(md5(uniqid('', true)), 0, 8);
         $fileName = $this->getFileName($package, $path);