mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check if color exists in palette before using it 

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Victor Dubiniuk 2017-01-31 23:13:40 +03:00 committed by Lukas Reschke
parent 6f0e38ac72
commit 111ca17d67
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/legacy/image.php
View File

@ -738,12 +738,12 @@ class OC_Image implements \OCP\IImage {
break; break;
case 8: case 8:
$color = @unpack('n', $vide . substr($data, $p, 1)); $color = @unpack('n', $vide . substr($data, $p, 1));
$color[1] = $palette[$color[1] + 1]; $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
break; break;
case 4: case 4:
$color = @unpack('n', $vide . substr($data, floor($p), 1)); $color = @unpack('n', $vide . substr($data, floor($p), 1));
$color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F; $color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F;
$color[1] = $palette[$color[1] + 1]; $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
break; break;
case 1: case 1:
$color = @unpack('n', $vide . substr($data, floor($p), 1)); $color = @unpack('n', $vide . substr($data, floor($p), 1));
@ -773,7 +773,7 @@ class OC_Image implements \OCP\IImage {
$color[1] = ($color[1] & 0x1); $color[1] = ($color[1] & 0x1);
break; break;
} }
$color[1] = $palette[$color[1] + 1]; $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
break; break;
default: default:
fclose($fh); fclose($fh);