Check if color exists in palette before using it

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

diff --git a/lib/private/legacy/image.php b/lib/private/legacy/image.php
index 7f4295e3e93a22890f073e8035a233b0d559b3b5..47f2a977e9cc153e4b4b52fa464c890c92095f7a 100644 (file)
--- a/lib/private/legacy/image.php
+++ b/lib/private/legacy/image.php
@@ -760,12 +760,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));
@@ -795,7 +795,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);