Skip to content

[stable29] chore(mp3info): apply upstream patch for invalid array access #46306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kesselb merged 2 commits into from
Jul 6, 2024
Merged

[stable29] chore(mp3info): apply upstream patch for invalid array access #46306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4bf0f6
feat: log file id and path when extracting the mp3 cover fails
kesselb Jul 3, 2024
f61bb58
chore(mp3info): apply upstream patch for invalid array access
kesselb Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 8 files
+32 −0 .patches/mp3info-check-array-key.diff
+1 −0 composer.json
+39 −21 composer.lock
+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
8 changes: 4 additions & 4 deletions lib/private/Preview/MP3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,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 {
/**
Expand All @@ -52,9 +52,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 {
Expand Down