summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2010-06-30 12:21:35 +0000
committerIlia Alshanetsky <iliaa@php.net>2010-06-30 12:21:35 +0000
commit0625a0b23b0dbc98d776bec8b619103ce8f749b6 (patch)
tree03300da4f09bfbaca6c1cb4b98d5d398f94ce79c /ext/standard
parentf1bb484bc259f662e4fe6609e32a92e7471efe81 (diff)
downloadphp-git-0625a0b23b0dbc98d776bec8b619103ce8f749b6.tar.gz
Fixed bug #33210 (getimagesize() fails to detect width/height on certain JPEGs).
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/image.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/ext/standard/image.c b/ext/standard/image.c
index 73b6f76ee9..e4d54cf7e6 100644
--- 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)
{