mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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 <lukas@statuscode.ch>
This commit is contained in:
Lukas Reschke 2016-12-01 16:52:12 +01:00
parent db2206450f
commit 072794d78d
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/private/Files/View.php
View File

@ -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;
}
}