svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/image.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/image.c
trunk/ext/standard/image.c
| From: | Ilia Alshanetsky | Date: | Wed, 30 Jun 2010 12:21:35 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/image.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/image.c trunk/ext/standard/image.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62994@lists.php.net to get a copy of this message | ||
iliaa Wed, 30 Jun 2010 12:21:35 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300881
Log:
Fixed bug #33210 (getimagesize() fails to detect width/height on certain JPEGs).
Bug: http://bugs.php.net/33210 (Assigned) getimagesize()
fails to detect width/height on certain JPEGs
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/standard/image.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/image.c
U php/php-src/trunk/ext/standard/image.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2010-06-30 11:28:42 UTC (rev 300880)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-06-30 12:21:35 UTC (rev 300881)
@@ -12,6 +12,8 @@
- Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command).
(Ilia, Felipe)
- Fixed bug #49730 (Firebird - new PDO() returns NULL). (Felipe)
+- Fixed bug #33210 (getimagesize() fails to detect width/height on certain
+ JPEGs). (Ilia)
17 Jun 2010, PHP 5.2.14RC1
- Upgraded bundled PCRE to version 8.02. (Ilia)
Modified: php/php-src/branches/PHP_5_2/ext/standard/image.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/image.c 2010-06-30 11:28:42 UTC (rev 300880)
+++ php/php-src/branches/PHP_5_2/ext/standard/image.c 2010-06-30 12:21:35 UTC (rev 300881)
@@ -398,12 +398,7 @@
last_marker = M_PSEUDO; /* stop skipping non 0xff for M_COM */
}
}
- if (++a > 25)
- {
- /* who knows the maxim amount of 0xff? though 7 */
- /* but found other implementations */
- return M_EOI;
- }
+ a++;
} while (marker == 0xff);
if (a < 2)
{
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-06-30 11:28:42 UTC (rev 300880)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-06-30 12:21:35 UTC (rev 300881)
@@ -17,6 +17,8 @@
(Felipe)
- Fixed bug #52115 (mysqli_result::fetch_all returns null, not an empty array).
(Andrey)
+- Fixed bug #33210 (getimagesize() fails to detect width/height on certain
+ JPEGs). (Ilia)
17 Jun 2010, PHP 5.3.3 RC1
- Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/standard/image.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/image.c 2010-06-30 11:28:42 UTC (rev 300880)
+++ php/php-src/branches/PHP_5_3/ext/standard/image.c 2010-06-30 12:21:35 UTC (rev 300881)
@@ -402,12 +402,7 @@
last_marker = M_PSEUDO; /* stop skipping non 0xff for M_COM */
}
}
- if (++a > 25)
- {
- /* who knows the maxim amount of 0xff? though 7 */
- /* but found other implementations */
- return M_EOI;
- }
+ a++;
} while (marker == 0xff);
if (a < 2)
{
Modified: php/php-src/trunk/ext/standard/image.c
===================================================================
--- php/php-src/trunk/ext/standard/image.c 2010-06-30 11:28:42 UTC (rev 300880)
+++ php/php-src/trunk/ext/standard/image.c 2010-06-30 12:21:35 UTC (rev 300881)
@@ -402,12 +402,7 @@
last_marker = M_PSEUDO; /* stop skipping non 0xff for M_COM */
}
}
- if (++a > 25)
- {
- /* who knows the maxim amount of 0xff? though 7 */
- /* but found other implementations */
- return M_EOI;
- }
+ a++;
} while (marker == 0xff);
if (a < 2)
{