From 89881ed5118f282bd3a93fe2dd092a296f17d2dc Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 7 Mar 2016 10:58:24 +0100 Subject: [PATCH] Fix call to disk_free_space when a file is provided In the case of shared files, we have to call free_space() on the file name. This has the side-effect that when uploading to a local storage without quota set, it will call disk_free_space with the file name, which fails. This fix uses the parent folder in case the given path is a file. --- lib/private/files/storage/local.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index aa2b462828..f6f5a8cc13 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -252,7 +252,15 @@ class Local extends \OC\Files\Storage\Common { } public function free_space($path) { - $space = @disk_free_space($this->getSourcePath($path)); + $sourcePath = $this->getSourcePath($path); + // using !is_dir because $sourcePath might be a part file or + // non-existing file, so we'd still want to use the parent dir + // in such cases + if (!is_dir($sourcePath)) { + // disk_free_space doesn't work on files + $sourcePath = dirname($sourcePath); + } + $space = @disk_free_space($sourcePath); if ($space === false || is_null($space)) { return \OCP\Files\FileInfo::SPACE_UNKNOWN; }