Merge pull request #46276 from nextcloud/3rdparty/patch-mp3info

chore(mp3info): apply upstream patch for invalid array access
nextcloud · Jul 4, 2024 · 8b3055c · 8b3055c
2 parents bd7b09a + 37454eb
commit 8b3055c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/3rdparty b/3rdparty
diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php
@@ -9,8 +9,8 @@
 
 use OCP\Files\File;
 use OCP\IImage;
-use Psr\Log\LoggerInterface;
 use wapmorgan\Mp3Info\Mp3Info;
+use function OCP\Log\logger;
 
 class MP3 extends ProviderV2 {
 	/**
@@ -31,9 +31,9 @@ public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
 			/** @var string|null|false $picture */
 			$picture = $audio->getCover();
 		} catch (\Throwable $e) {
-			\OC::$server->get(LoggerInterface::class)->info($e->getMessage(), [
-				'exception' => $e,
-				'app' => 'core',
+			logger('core')->info('Error while getting cover from mp3 file: ' . $e->getMessage(), [
+				'fileId' => $file->getId(),
+				'filePath' => $file->getPath(),
 			]);
 			return null;
 		} finally {
+0 −16		.github/dependabot.yml
+32 −0		.patches/mp3info-check-array-key.diff
+8 −6		composer.patches.json
+5 −0		composer/installed.json
+6 −6		composer/installed.php
+7 −0		wapmorgan/mp3info/PATCHES.txt
+6 −1		wapmorgan/mp3info/src/Mp3Info.php