summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2005-02-01 23:29:01 +0000
committerIlia Alshanetsky <iliaa@php.net>2005-02-01 23:29:01 +0000
commit59e73f08ffad562247f38c071df652edb7ab7cd1 (patch)
tree59cee87096ad9c88db8c82d3f363172d77ab782b
parent917a493fae865d8fad642854f0900cec1f68bd7d (diff)
downloadphp-git-59e73f08ffad562247f38c071df652edb7ab7cd1.tar.gz
MFH: Fixed bug #31797 (exif_read_data() uses too low nesting limit).
-rw-r--r--NEWS1
-rw-r--r--ext/exif/exif.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2d9d0a8983..b24fe391ec 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ PHP 4 NEWS
- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
- Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar). (Ilia)
- Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
(elod at itfais dot com)
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 314473fbd6..5ace797b67 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -85,7 +85,7 @@ typedef unsigned char uchar;
#define EFREE_IF(ptr) if (ptr) efree(ptr)
-#define MAX_IFD_NESTING_LEVEL 5
+#define MAX_IFD_NESTING_LEVEL 25
static unsigned char exif_thumbnail_force_ref[] = {2, BYREF_NONE, BYREF_FORCE_REST};