Correctly remove the charset from finfo mimetype

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
index 492025b7bfc..66ef0dd2aab 100644
--- a/lib/private/Files/Type/Detection.php
+++ b/lib/private/Files/Type/Detection.php
@@ -200,7 +200,7 @@ class Detection implements IMimeTypeDetector {
 			$info = @strtolower(finfo_file($finfo, $path));
 			finfo_close($finfo);
 			if ($info) {
-				$mimeType = substr($info, 0, strpos($info, ';'));
+				$mimeType = strpos($info, ';') !== false ? substr($info, 0, strpos($info, ';')) : $info;
 				return empty($mimeType) ? 'application/octet-stream' : $mimeType;
 			}
 
@@ -238,7 +238,8 @@ class Detection implements IMimeTypeDetector {
 	public function detectString($data) {
 		if (function_exists('finfo_open') and function_exists('finfo_file')) {
 			$finfo = finfo_open(FILEINFO_MIME);
-			return finfo_buffer($finfo, $data);
+			$info = finfo_buffer($finfo, $data);
+			return strpos($info, ';') !== false ? substr($info, 0, strpos($info, ';')) : $info;
 		} else {
 			$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
 			$fh = fopen($tmpFile, 'wb');