Fixed bug #33210 (getimagesize() fails to detect width/height on certain JPEGs).

diff --git a/NEWS b/NEWS
index d2c15b7d4819e2176f9b9b013edfff7ef0307f04..66af9761503dc7667d2e13df170d50025950daa5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ PHP                                                                        NEWS
   (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)

diff --git a/ext/standard/image.c b/ext/standard/image.c
index df8cd4b3a9f6488d3669c1e2acf17a13bb8bb86c..10a820a3d53fb77ff5b813ebbd768ad14466f70a 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -402,12 +402,7 @@ static unsigned int php_next_marker(php_stream * stream, int last_marker, int co
                                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)
        {