Merge pull request #10395 from owncloud/close-filehandle-lib-files

Close open file handles in files library
remotes/origin/fix-10825
Morris Jobke 11 years ago
commit 987a0565fb
  1. 1
      lib/private/files/storage/common.php
  2. 1
      lib/private/files/storage/dav.php
  3. 1
      lib/private/files/view.php

@ -226,6 +226,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
$tmpFile = \OC_Helper::tmpFile($extension);
$target = fopen($tmpFile, 'w');
\OC_Helper::streamCopy($source, $target);
fclose($target);
return $tmpFile;
}

@ -295,6 +295,7 @@ class DAV extends \OC\Files\Storage\Common {
\OCP\Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, \OCP\Util::ERROR);
}
curl_close($curl);
fclose($source);
$this->removeCachedFile($target);
}

@ -670,6 +670,7 @@ class View {
$source = fopen($tmpFile, 'r');
if ($source) {
$this->file_put_contents($path, $source);
fclose($source);
unlink($tmpFile);
return true;
} else {

Loading…
Cancel
Save