From 178ad23d80406e72ddf55d08e318fb124ab3013a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 8 Apr 2016 14:50:42 +0200 Subject: Correctly return an empty string for empty files --- lib/private/files/storage/local.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib/private/files') diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index b6d0ec3fb34..b0918c82f98 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; } -- cgit v1.2.3