Merge pull request #24371 from nextcloud/backport/21844/stable18

[stable18] Avoid substr() error when strpos returns false

1 files changed, 9 insertions, 6 deletions

diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
index 4e7f89778a4..9e85115f0a9 100644
--- a/lib/private/Files/Type/Detection.php
+++ b/lib/private/Files/Type/Detection.php
@@ -380,12 +380,15 @@ class Detection implements IMimeTypeDetector {
 		}
 
 		// Try only the first part of the filetype
-		$mimePart = substr($icon, 0, strpos($icon, '-'));
-		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
-			return $this->mimetypeIcons[$mimetype];
-		} catch (\RuntimeException $e) {
-			// Image for the first part of the mimetype not found
+
+		if (strpos($icon, '-')) {
+			$mimePart = substr($icon, 0, strpos($icon, '-'));
+			try {
+				$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
+				return $this->mimetypeIcons[$mimetype];
+			} catch (\RuntimeException $e) {
+				// Image for the first part of the mimetype not found
+			}
 		}
 
 		$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/file.svg');