From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Sat, 27 May 2023 22:30:47 +0000 (+0200)
Subject: fix: catch errors in id3parser library
X-Git-Tag: v26.0.3rc1~43^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F38517%2Fhead;p=nextcloud-server.git

fix: catch errors in id3parser library

We use a forked version of getID3 to read embedded images from mp3 files to use them as previews.

If the library is unable to extract a image or fails on something different we should handle it properly.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---

diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php
index 47d752af477..ff6ff86c966 100644
--- a/lib/private/Preview/MP3.php
+++ b/lib/private/Preview/MP3.php
@@ -32,6 +32,7 @@ use ID3Parser\ID3Parser;
 
 use OCP\Files\File;
 use OCP\IImage;
+use Psr\Log\LoggerInterface;
 
 class MP3 extends ProviderV2 {
 	/**
@@ -48,8 +49,18 @@ class MP3 extends ProviderV2 {
 		$getID3 = new ID3Parser();
 
 		$tmpPath = $this->getLocalFile($file);
-		$tags = $getID3->analyze($tmpPath);
-		$this->cleanTmpFiles();
+		try {
+			$tags = $getID3->analyze($tmpPath);
+		} catch (\Throwable $e) {
+			\OC::$server->get(LoggerInterface::class)->info($e->getMessage(), [
+				'exception' => $e,
+				'app' => 'core',
+			]);
+			return null;
+		} finally {
+			$this->cleanTmpFiles();
+		}
+
 		$picture = isset($tags['id3v2']['APIC'][0]['data']) ? $tags['id3v2']['APIC'][0]['data'] : null;
 		if (is_null($picture) && isset($tags['id3v2']['PIC'][0]['data'])) {
 			$picture = $tags['id3v2']['PIC'][0]['data'];