blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

floIcon: set cap on image size

Browse source
This commit is contained in:
Andrew Dolgov 2013-04-16 23:24:50 +04:00
parent 4fe9327491
commit cb50799560
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/floIcon.php
View file

@ -16,13 +16,13 @@ Date: 2009-03-16
Changes: Changes:
I was a little hasty on that last update. A couple new bugs from 1.1.0 have I was a little hasty on that last update. A couple new bugs from 1.1.0 have
been fixed. been fixed.
Version 1.1.0: Version 1.1.0:
Date: 2009-03-16 Date: 2009-03-16
Changes: Changes:
Added Vista support. Added Vista support.
Fixed a number of minor bugs. Many thanks to Dvir Berebi for pointing Fixed a number of minor bugs. Many thanks to Dvir Berebi for pointing
them out. them out.
@ -386,7 +386,7 @@ class floIconImage {
imagealphablending($imageResource, false); imagealphablending($imageResource, false);
$height = imagesy($imageResource); $height = imagesy($imageResource);
$width = imagesx($imageResource); $width = imagesx($imageResource);
// Parse resource to determine header and icon format // Parse resource to determine header and icon format
// Find Palette information // Find Palette information
@ -637,7 +637,7 @@ class floIconImage {
$this->_imageIconFormat = $imageAsPng; $this->_imageIconFormat = $imageAsPng;
} }
} }
function _createImageResource() { function _createImageResource() {
if ($newImage = @imagecreatefromstring($this->_headerIconFormat.$this->_imageIconFormat)) { if ($newImage = @imagecreatefromstring($this->_headerIconFormat.$this->_imageIconFormat)) {
@ -780,6 +780,10 @@ class floIconImage {
$this->_entryIconFormat = fread($filePointer, 16); $this->_entryIconFormat = fread($filePointer, 16);
$this->_entry = unpack("CWidth/CHeight/CColorCount/CReserved/SPlanes/SBitCount/LSizeInBytes/LFileOffset", $this->_entryIconFormat); $this->_entry = unpack("CWidth/CHeight/CColorCount/CReserved/SPlanes/SBitCount/LSizeInBytes/LFileOffset", $this->_entryIconFormat);
// fox
if ($this->_entry["SizeInBytes"] > 16384)
$this->_entry["SizeInBytes"] = 16384;
// Position the file pointer. // Position the file pointer.
fseek($filePointer, $this->_entry["FileOffset"]); fseek($filePointer, $this->_entry["FileOffset"]);
@ -840,4 +844,4 @@ class floIconImage {
$this->_imageResource = null; $this->_imageResource = null;
} }
} }
?> ?>