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

Merge pull request #38959 from nextcloud/fix/oc-image-bmp-no-color

Browse source 
[stable25] fix: BMP image without color info causes array access on `false`
This commit is contained in:
Christoph Wurst 2023-07-05 10:54:09 +02:00 committed by GitHub
commit 54885eaeb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/legacy/OC_Image.php
View file

@ -931,6 +931,11 @@ class OC_Image implements \OCP\IImage {
break;
case 8:
$color = @unpack('n', $vide . ($data[$p] ?? ''));
if ($color === false) {
fclose($fh);
$this->logger->warning('Invalid 8bit bmp without color', ['app' => 'core']);
return false;
}
$color[1] = isset($palette[$color[1] + 1]) ? $palette[$color[1] + 1] : $palette[1];
break;
case 4: