2003-12-08 Lutz Mueller <lutz@users.sourceforge.net>

	Suggestion by Jan Patera <patera@pictview.com>:

	* libexif/exif-entry.c: Do not read beyond e->size.

diff --git a/ChangeLog b/ChangeLog
index 192f2cf..415a769 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-08  Lutz Mueller <lutz@users.sourceforge.net>
+
+       Suggestion by Jan Patera <patera@pictview.com>:
+
+       * libexif/exif-entry.c: Do not read beyond e->size.
+
 2003-12-01  Lutz Mueller <lutz@users.sourceforge.net>
 
        * libexif/olympus/mnote-olympus-entry.c: Now that EXIF_FORMAT_SSHORT

diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index 140655e..2694d05 100644 (file)
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -177,7 +177,7 @@ exif_entry_get_value (ExifEntry *e)
        case EXIF_TAG_USER_COMMENT:
                CF (e->format, EXIF_FORMAT_UNDEFINED, v);
                if (e->size < 8) break;
-               strncpy (v, e->data + 8, sizeof (v) - 1);
+               strncpy (v, e->data + 8, MIN (e->size, sizeof (v) - 1));
                break;
        case EXIF_TAG_EXIF_VERSION:
                CF (e->format, EXIF_FORMAT_UNDEFINED, v);