Merge pull request #23860 from owncloud/followup-23304-opening-empty-file

Correctly return an empty string for empty files

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 9f093ce048a..25b202af5f8 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -177,9 +177,15 @@ class Local extends \OC\Files\Storage\Common {
 
 	public function file_get_contents($path) {
 		// file_get_contents() has a memory leak: https://bugs.php.net/bug.php?id=61961
-		$filename = $this->getSourcePath($path);
-		$handle = fopen($filename,'rb');
-		$content = fread($handle, filesize($filename));
+		$fileName = $this->getSourcePath($path);
+
+		$fileSize = filesize($fileName);
+		if ($fileSize === 0) {
+			return '';
+		}
+
+		$handle = fopen($fileName,'rb');
+		$content = fread($handle, $fileSize);
 		fclose($handle);
 		return $content;
 	}