From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 12:32:22 +0000 (+0400)
Subject: floIcon: add experimental SizeInBytes cap
X-Git-Tag: 1.7.9~25^2~137
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=6a1f4249241764482f0419e3993fdd875f7e4ad3

floIcon: add experimental SizeInBytes cap
---

diff --git a/lib/floIcon.php b/lib/floIcon.php
index e9498b0e..59902b6a 100644
--- a/lib/floIcon.php
+++ b/lib/floIcon.php
@@ -16,13 +16,13 @@ Date: 2009-03-16
 
 Changes:
 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:
 Date: 2009-03-16
 
 Changes:
-Added Vista support.  
+Added Vista support.
 Fixed a number of minor bugs.  Many thanks to Dvir Berebi for pointing
         them out.
 
@@ -291,8 +291,9 @@ class floIcon {
                         $header = unpack("SReserved/SType/SCount", fread($filePointer, 6));
                         for ($t = 0; $t < $header["Count"]; $t++) {
                                 $newImage = new floIconImage();
-                                $newImage->readImageFromICO($filePointer, 6 + ($t * 16));
-                                $this->images[] = $newImage;
+                                if ($newImage->readImageFromICO($filePointer, 6 + ($t * 16))) {
+											  $this->images[] = $newImage;
+										  }
                         }
                         fclose($filePointer);
                 }
@@ -386,7 +387,7 @@ class floIconImage {
                 imagealphablending($imageResource, false);
                 $height = imagesy($imageResource);
                 $width = imagesx($imageResource);
-               
+
                 // Parse resource to determine header and icon format
 
                 // Find Palette information
@@ -637,7 +638,7 @@ class floIconImage {
                         $this->_imageIconFormat = $imageAsPng;
                 }
 
-       
+
         }
         function _createImageResource() {
                 if ($newImage = @imagecreatefromstring($this->_headerIconFormat.$this->_imageIconFormat)) {
@@ -780,6 +781,9 @@ class floIconImage {
                 $this->_entryIconFormat = fread($filePointer, 16);
                 $this->_entry = unpack("CWidth/CHeight/CColorCount/CReserved/SPlanes/SBitCount/LSizeInBytes/LFileOffset", $this->_entryIconFormat);
 
+					 if ($this->_entry["SizeInBytes"] > 16384)
+						 return false;
+
                 // Position the file pointer.
                 fseek($filePointer, $this->_entry["FileOffset"]);
 
@@ -815,7 +819,9 @@ class floIconImage {
                 }
                 if ($this->_entry["Height"] == 0) {
                         $this->_entry["Height"] = $this->_header["Height"]/2;
-                }
+					 }
+
+					 return true;
         }
         function getHeader() {
                 return $this->_header;
@@ -840,4 +846,4 @@ class floIconImage {
                 $this->_imageResource = null;
         }
 }
-?>
\ No newline at end of file
+?>