Index: t3lib/class.t3lib_stdgraphic.php
===================================================================
--- t3lib/class.t3lib_stdgraphic.php	(revision 6109)
+++ t3lib/class.t3lib_stdgraphic.php	(working copy)
@@ -2561,17 +2561,14 @@
 	}
 
 	/**
-	 * Wrapping the input filename in double-quotes
+	 * Escapes a file name so it can safely be used on the command line.
 	 *
-	 * @param	string		Input filename
-	 * @return	string		The output wrapped in "" (if there are spaces in the filepath)
-	 * @access private
+	 * @param string $inputName filename to safeguard, must not be empty
+	 *
+	 * @return string $inputName escaped as needed
 	 */
-	function wrapFileName($inputName)	{
-		if (strstr($inputName,' '))	{
-			$inputName='"'.$inputName.'"';
-		}
-		return $inputName;
+	protected function wrapFileName($inputName) {
+		return escapeshellarg($inputName);
 	}
 
 
@@ -2779,7 +2776,7 @@
 			break;
 		}
 		if ($result) {
-			t3lib_div::fixPermissions($theImage); 
+			t3lib_div::fixPermissions($theImage);
 		}
 		return $result;
 	}