2003-04-28 Lutz Mueller <lutz@users.sourceforge.net>

	Bug discovered by Jay Love <jslove@users.sourceforge.net>

	* libexif/exif-entry.c: Don't crash if EXIF_TAG_COPYRIGHT is NULL.

diff --git a/ChangeLog b/ChangeLog
index b46550c..99827df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-04-28  Lutz Mueller <lutz@users.sourceforge.net>
 
+       Bug discovered by Jay Love <jslove@users.sourceforge.net>
+
+       * libexif/exif-entry.c: Don't crash if EXIF_TAG_COPYRIGHT is NULL.
+
+2003-04-28  Lutz Mueller <lutz@users.sourceforge.net>
+
        Patch by Gernot Jander <gernot@bigpond.com>:
 
        * libexif/exif-tag.c: Add call to bind_textdomain_codeset

diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index e1d6901..cd9e9da 100644 (file)
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -192,12 +192,13 @@ exif_entry_get_value (ExifEntry *e)
                break;
        case EXIF_TAG_COPYRIGHT:
                CF (e->format, EXIF_FORMAT_ASCII, v);
-               if (strlen ((char *) e->data))
+               if (e->size && e->data)
                        strncpy (v, e->data, sizeof (v));
                else
                        strncpy (v, "[None]", sizeof (v));
                strncat (v, " (Photographer) - ", sizeof (v));
-               if (strlen ((char *) e->data + strlen ((char *) e->data) + 1))
+               if (e->size && e->data &&
+                   strlen ((char *) e->data + strlen ((char *) e->data) + 1))
                        strncat (v, e->data + strlen (e->data) + 1,
                                 sizeof (v));
                else