diff options
| author | Daniel <mail@danielkesselberg.de> | 2023-06-01 20:38:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-01 20:38:22 +0200 |
| commit | 47cdef062dafc44b9eb259376ffe0da872e2d227 (patch) | |
| tree | d47413895bdfc1aadabc8b966bfcb7504b95128d | |
| parent | e90919b8dec892cd17964626e98355d5722b4890 (diff) | |
| parent | 0c0dba69d1f17d992032d74567d6964da2b63789 (diff) | |
| download | nextcloud-server-47cdef062dafc44b9eb259376ffe0da872e2d227.tar.gz nextcloud-server-47cdef062dafc44b9eb259376ffe0da872e2d227.zip | |
Merge pull request #38518 from nextcloud/backport/38496/stable25
[stable25] fix: catch errors in id3parser library
| -rw-r--r-- | lib/private/Preview/MP3.php | 15 |
1 files changed, 13 insertions, 2 deletions
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']; |