From 404c37246a6363ba1c1ba00e0c97265582ed8b32 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Wed, 21 Jan 2009 23:27:57 -0800 Subject: [PATCH] Reduce the recursion limit --- libexif/exif-data.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libexif/exif-data.c b/libexif/exif-data.c index 80df646..e267f34 100644 --- a/libexif/exif-data.c +++ b/libexif/exif-data.c @@ -346,7 +346,7 @@ if (data->ifd[(i)]->count) { \ /*! Load data for an IFD. * - * \param[in/out] data #ExifData + * \param[in,out] data #ExifData * \param[in] ifd IFD to load * \param[in] d pointer to buffer containing raw IFD data * \param[in] ds size of raw data in buffer at \c d @@ -372,7 +372,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, if (( ((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) return; - if (recursion_depth > 150) { + if (recursion_depth > 30) { exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", "Deep recursion detected!"); return; @@ -513,7 +513,7 @@ exif_data_save_data_content (ExifData *data, ExifContent *ifd, if (ifd == data->ifd[i]) break; if (i == EXIF_IFD_COUNT) - return; + return; /* error */ /* * Check if we need some extra entries for pointers or the thumbnail. -- 2.7.4