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

Ilia Alshanetsky · Ilia Alshanetsky · commit 0625a0b23b0d · 2010-06-30T12:21:35.000Z
diff --git 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)
 	{

Original file line number	Diff line number	Diff line change
`@@ -402,12 +402,7 @@ static unsigned int php_next_marker(php_stream * stream, int last_marker, int co`
`402`	`402`	`last_marker = M_PSEUDO; /* stop skipping non 0xff for M_COM */`
`403`	`403`	`}`
`404`	`404`	`}`
`405`		`- if (++a > 25)`
`406`		`- {`
`407`		`- /* who knows the maxim amount of 0xff? though 7 */`
`408`		`- /* but found other implementations */`
`409`		`- return M_EOI;`
`410`		`- }`
	`405`	`+ a++;`
`411`	`406`	`} while (marker == 0xff);`
`412`	`407`	`if (a < 2)`
`413`	`408`	`{`