2004-04-04 Lutz Mueller lutz@users.sourceforge.net

	* libexif/exif-data.c: If we don't know a tag we are going to parse,
	  stop loading. This should fix bug #138238.

diff --git a/ChangeLog b/ChangeLog
index 403dacc..33b9570 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-04  Lutz Mueller lutz@users.sourceforge.net
+
+       * libexif/exif-data.c: If we don't know a tag we are going to parse,
+         stop loading. This should fix bug #138238.
+
 2004-04-02  Jan Patera <patera@users.sourceforge.net>
 
        * libexif/pentax/exif-mnote-data-pentax.c: correct search for values

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 46bb5b4..d66c90d 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -287,6 +287,12 @@ exif_data_load_data_content (ExifData *data, ExifContent *ifd,
                        }
                        break;
                default:
+
+                       /*
+                        * If we don't know the tag, changes are high
+                        * that the EXIF data does not follow the standard.
+                        */
+                       if (!exif_tag_get_name (tag)) return;
                        entry = exif_entry_new ();
                        exif_content_add_entry (ifd, entry);
                        exif_data_load_data_entry (data, entry, d, ds,