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

Merge pull request #3439 from nextcloud/oc-26963 

Make sure invalid images don't flood the log file
This commit is contained in:
Lukas Reschke 2017-02-16 16:34:18 +01:00 committed by GitHub
parent cdc48d301e 2585f195da
commit cf582a6d14
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -747,7 +747,7 @@ class OC_Image implements \OCP\IImage {
$this->logger->warning($error, array('app' => 'core')); $this->logger->warning($error, array('app' => 'core'));
return $im; return $im;
} }
$color = unpack('V', $part . $vide); $color = @unpack('V', $part . $vide);
break; break;
case 16: case 16:
if (!($part = substr($data, $p, 2))) { if (!($part = substr($data, $p, 2))) {
@ -755,20 +755,20 @@ class OC_Image implements \OCP\IImage {
$this->logger->warning($error, array('app' => 'core')); $this->logger->warning($error, array('app' => 'core'));
return $im; return $im;
} }
$color = unpack('v', $part); $color = @unpack('v', $part);
$color[1] = (($color[1] & 0xf800) >> 8) * 65536 + (($color[1] & 0x07e0) >> 3) * 256 + (($color[1] & 0x001f) << 3); $color[1] = (($color[1] & 0xf800) >> 8) * 65536 + (($color[1] & 0x07e0) >> 3) * 256 + (($color[1] & 0x001f) << 3);
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));
switch (($p * 8) % 8) { switch (($p * 8) % 8) {
case 0: case 0:
$color[1] = $color[1] >> 7; $color[1] = $color[1] >> 7;
@ -795,7 +795,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);