6.2.5 (2015-01-24)

- Bug #1019 " in static context" was fixed.
- Bug #1015 "Infinite loop in getIndirectObject method of parser" was fixed.

CHANGELOG.TXT

@@ -1,3 +1,7 @@
+6.2.5 (2015-01-24)
+	- Bug #1019 "$this in static context" was fixed.
+	- Bug #1015 "Infinite loop in getIndirectObject method of parser" was fixed.
+
 6.2.4 (2015-01-08)
 	- fix warning related to empty K_PATH_URL.
 	- fix error when a $table_colwidths key is not set.

README.TXT

@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 6.2.4
+Version: 6.2.5
-Release date: 2015-01-08
+Release date: 2015-01-24
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2015:

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "tecnick.com/tcpdf",
-	"version": "6.2.4",
+	"version": "6.2.5",
 	"homepage": "http://www.tcpdf.org/",
 	"type": "library",
 	"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",

include/tcpdf_static.php

@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf_static.php
-// Version     : 1.1.1
+// Version     : 1.1.2
 // Begin       : 2002-08-03
-// Last Update : 2015-01-08
+// Last Update : 2015-01-24
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -38,7 +38,7 @@
  * This is a PHP class that contains static methods for the TCPDF class.<br>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 1.1.1
+ * @version 1.1.2
  */
 
 /**
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.2.3';
+	private static $tcpdf_version = '6.2.5';
 
 	/**
 	 * String alias for total number of pages.
@@ -2435,7 +2435,7 @@ class TCPDF_STATIC {
 		if (strpos($filename, '://') === false) {
 			$filename = 'file://'.$filename;
 		} elseif (strpos($filename, 'file://') !== 0) {
-			$this->Error('Unsupported file protocol');
+			return false;
 		}
 		return fopen($filename, $mode);
 	}

tcpdf.php

@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.2.4
+// Version     : 6.2.5
 // Begin       : 2002-08-03
-// Last Update : 2015-01-08
+// Last Update : 2015-01-24
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -104,7 +104,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 6.2.4
+ * @version 6.2.5
  */
 
 // TCPDF configuration
@@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
  * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.2.4
+ * @version 6.2.5
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF {

tcpdf_parser.php

@@ -1,13 +1,13 @@
 <?php
 //============================================================+
 // File name   : tcpdf_parser.php
-// Version     : 1.0.014
+// Version     : 1.0.15
 // Begin       : 2011-05-23
-// Last Update : 2014-02-18
+// Last Update : 2015-01-24
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
 // -------------------------------------------------------------------
-// Copyright (C) 2011-2014 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2011-2015 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -37,7 +37,7 @@
  * This is a PHP class for parsing PDF documents.<br>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 1.0.014
+ * @version 1.0.15
  */
 
 // include class for decoding filters
@@ -48,7 +48,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
  * This is a PHP class for parsing PDF documents.<br>
  * @package com.tecnick.tcpdf
  * @brief This is a PHP class for parsing PDF documents..
- * @version 1.0.010
+ * @version 1.0.15
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF_PARSER {
@@ -690,7 +690,8 @@ class TCPDF_PARSER {
 		$objdata = array();
 		$i = 0; // object main index
 		do {
-			// get element
+			$oldoffset = $offset;
+                        // get element
 			$element = $this->getRawObject($offset);
 			$offset = $element[2];
 			// decode stream using stream's dictionary information
@@ -699,7 +700,7 @@ class TCPDF_PARSER {
 			}
 			$objdata[$i] = $element;
 			++$i;
-		} while ($element[0] != 'endobj');
+		} while (($element[0] != 'endobj') AND ($offset != $oldoffset));
 		// remove closing delimiter
 		array_pop($objdata);
 		// return raw object content