From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 16 Apr 2014 17:45:55 +0000 (+0200)
Subject: escape $second + update PHPDoc
X-Git-Tag: v7.0.0alpha2~410^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a4389340b822ac8cae051811d838b6c607f88dbd;p=nextcloud-server.git

escape $second + update PHPDoc
---

diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php
index ed28a03afab..72ccfadc6e9 100644
--- a/lib/private/preview/movies.php
+++ b/lib/private/preview/movies.php
@@ -65,11 +65,11 @@ if (!\OC_Util::runningOnWindows()) {
 			}
 
 			/**
-			 * @param $maxX
-			 * @param $maxY
-			 * @param $absPath
-			 * @param $tmpPath
-			 * @param $second
+			 * @param int $maxX
+			 * @param int $maxY
+			 * @param string $absPath
+			 * @param string $tmpPath
+			 * @param int $second
 			 * @return bool|\OC_Image
 			 */
 			private function generateThumbNail($maxX, $maxY, $absPath, $second)
@@ -77,12 +77,12 @@ if (!\OC_Util::runningOnWindows()) {
 				$tmpPath = \OC_Helper::tmpFile();
 
 				if (self::$avconvBinary) {
-					$cmd = self::$avconvBinary . ' -an -y -ss ' . $second .
+					$cmd = self::$avconvBinary . ' -an -y -ss ' . escapeshellarg($second) .
 						' -i ' . escapeshellarg($absPath) .
 						' -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
 						' > /dev/null 2>&1';
 				} else {
-					$cmd = self::$ffmpegBinary . ' -y -ss ' .$second .
+					$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
 						' -i ' . escapeshellarg($absPath) .
 						' -f mjpeg -vframes 1' .
 						' -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) .