From 82afe80d9e716fb06cb23d6f218a95811363684b Mon Sep 17 00:00:00 2001 From: Jan Patera Date: Wed, 9 Mar 2005 07:02:45 +0100 Subject: [PATCH] 2005-03-09 Jan Patera * exif_data.c: Final fix of Ubuntu Security Notice USN-91-1 https://bugzilla.ubuntulinux.org/show_bug.cgi?id=7152 Most of the problem (including most important parts) was already fixed in the past. --- ChangeLog | 4 ++++ libexif/exif-data.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5f24f0..f74f601 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-03-09 Jan Patera + * exif_data.c: Final fix of Ubuntu Security Notice USN-91-1 + https://bugzilla.ubuntulinux.org/show_bug.cgi?id=7152 + 2005-02-08 Hans Ulrich Niedermann * autogen.sh: Updated build system: diff --git a/libexif/exif-data.c b/libexif/exif-data.c index f1c71da..bd8d001 100644 --- a/libexif/exif-data.c +++ b/libexif/exif-data.c @@ -696,7 +696,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, "Found EXIF header."); /* Byte order (offset 6, length 2) */ - if (ds < 12) + if (ds < 14) return; if (!memcmp (d + 6, "II", 2)) data->priv->order = EXIF_BYTE_ORDER_INTEL; @@ -714,7 +714,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "IFD 0 at %i.", (int) offset); - /* Parse the actual exif data (offset 14) */ + /* Parse the actual exif data (usually offset 14 from start) */ exif_data_load_data_content (data, data->ifd[EXIF_IFD_0], d + 6, ds - 6, offset); -- 2.7.4