From 072794d78dfe3ad4f8785322b9a4ba78fb389174 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 1 Dec 2016 16:52:12 +0100 Subject: [PATCH] [stable10] Prevent endless loop in \OC\Files\View::createParentDirectories \OC\Files\View::createParentDirectories was previously prone to an endless loop. If a path such as /foo/existingfile.txt/bar/foo was passed and existingfile.txt existed in foo the loop was never left and running until the PHP process timed out. This commit changes the logic to a foreach loop over an array and additionally additional error handling using is_file. Signed-off-by: Lukas Reschke --- lib/private/Files/View.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index fa6ba20c342..ee6542216d2 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -2120,14 +2120,19 @@ class View { * @return bool */ private function createParentDirectories($filePath) { - $parentDirectory = dirname($filePath); - while(!$this->file_exists($parentDirectory)) { - $result = $this->createParentDirectories($parentDirectory); - if($result === false) { + $directoryParts = explode('/', $filePath); + $directoryParts = array_filter($directoryParts); + foreach($directoryParts as $key => $part) { + $currentPathElements = array_slice($directoryParts, 0, $key); + $currentPath = '/' . implode('/', $currentPathElements); + if($this->is_file($currentPath)) { return false; } + if(!$this->file_exists($currentPath)) { + $this->mkdir($currentPath); + } } - $this->mkdir($filePath); + return true; } } -- 2.39.5