Merge pull request #30507 from owncloud/a-pack-of-fclose

Free resources in preview providers
owncloud · Feb 19, 2018 · 3b420d6 · 3b420d6
2 parents 0a0d750 + 371f2be
commit 3b420d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lib/private/Preview/Bitmap.php b/lib/private/Preview/Bitmap.php
@@ -49,9 +49,10 @@ public function getThumbnail(File $file, $maxX, $maxY, $scalingUp) {
 		} catch (\Exception $e) {
 			Util::writeLog('core', 'ImageMagick says: ' . $e->getmessage(), Util::ERROR);
 			return false;
+		} finally {
+			fclose($stream);
 		}
 
-		fclose($stream);
 
 		//new bitmap image object
 		$image = new \OC_Image();

diff --git a/lib/private/Preview/SVG.php b/lib/private/Preview/SVG.php
@@ -42,10 +42,12 @@ public function getThumbnail(File $file, $maxX, $maxY, $scalingUp) {
 			$svg = new \Imagick();
 			$svg->setBackgroundColor(new \ImagickPixel('transparent'));
 
-			$content = stream_get_contents($file->fopen('r'));
+			$stream = $file->fopen('r');
+			$content = stream_get_contents($stream);
 			if (substr($content, 0, 5) !== '<?xml') {
 				$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
 			}
+			fclose($stream);
 
 			// Do not parse SVG files with references
 			if (stripos($content, 'xlink:href') !== false) {

diff --git a/lib/private/Preview/TXT.php b/lib/private/Preview/TXT.php
@@ -40,8 +40,9 @@ public function getMimeType() {
 	 * {@inheritDoc}
 	 */
 	public function getThumbnail(File $file, $maxX, $maxY, $scalingUp) {
-		$content = $file->fopen('r');
-		$content = stream_get_contents($content,3000);
+		$stream = $file->fopen('r');
+		$content = stream_get_contents($stream,3000);
+		fclose($stream);
 
 		//don't create previews of empty text files
 		if(trim($content) === '') {