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

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

Correctly return an empty string for empty files
This commit is contained in:
Thomas Müller 2016-04-11 10:08:24 +02:00
parent c6f65a3c79 178ad23d80
commit e2c4a0cecd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/files/storage/local.php
View File

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