diff options
| author | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2017-02-01 00:30:01 +0300 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2017-02-10 18:30:02 +0300 |
| commit | a808233ee7fe929f60c3aaf9632341daccc14a30 (patch) | |
| tree | 8254b35eeaf7440c94970ac54454d198e6e00ec5 | |
| parent | 3b70a57e1d9c1c9a63f2e4627f553450c5068b4a (diff) | |
Check if color exists in palette before using it
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| -rw-r--r-- | lib/private/image.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/image.php b/lib/private/image.php index 225266f6787..0683ce1d18c 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -738,12 +738,12 @@ class OC_Image implements \OCP\IImage { break; case 8: $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; case 4: $color = @unpack('n', $vide . substr($data, floor($p), 1)); $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; case 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); break; } - $color[1] = $palette[$color[1] + 1]; + $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1]; break; default: fclose($fh); |