]> granicus.if.org Git - php/commitdiff
Fixed bug #33210 (getimagesize() fails to detect width/height on certain JPEGs).
authorIlia Alshanetsky <iliaa@php.net>
Wed, 30 Jun 2010 12:21:35 +0000 (12:21 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Wed, 30 Jun 2010 12:21:35 +0000 (12:21 +0000)
ext/standard/image.c

index 73b6f76ee9d178a6b844913d3bbe2714d95cf329..e4d54cf7e602856a0926642f938a512801abc50a 100644 (file)
@@ -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)
        {