Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Dubiniuk <victor.dubiniuk@gmail.com>2017-01-31 23:13:40 +0300
committerLukas Reschke <lukas@statuscode.ch>2017-02-10 18:29:04 +0300
commit111ca17d67e6dfcbbf4e6ae4af9b8130f7495f52 (patch)
tree18ed57e5ee6c6e123275fb5b34cf74be4644e865
parent6f0e38ac72109d9af3b764728c55649bb4b3ed9b (diff)
Check if color exists in palette before using it
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
-rw-r--r--lib/private/legacy/image.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/legacy/image.php b/lib/private/legacy/image.php
index 225266f6787..0683ce1d18c 100644
--- a/lib/private/legacy/image.php
+++ b/lib/private/legacy/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);