upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-29 01:50:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 51

Merge pull request #38518 from nextcloud/backport/38496/stable25

Browse source 
[stable25] fix: catch errors in id3parser library
This commit is contained in:
Daniel 2023-06-01 20:38:22 +02:00 committed by GitHub
commit 47cdef062d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/private/Preview/MP3.php
View file

@ -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'];