2004-06-22 Lutz Mueller <lutz@users.sourceforge.net>

	* libexif/olympus/mnote-olympus-entry.c: Correct the usage of
	  strncat. Fix pointed out by Serge Droz <serge.droz@psi.ch>.

diff --git a/ChangeLog b/ChangeLog
index 67df8fc..b7ae012 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-06-22  Lutz Mueller <lutz@users.sourceforge.net>
 
+       * libexif/olympus/mnote-olympus-entry.c: Correct the usage of 
+         strncat. Fix pointed out by Serge Droz <serge.droz@psi.ch>.
+
+2004-06-22  Lutz Mueller <lutz@users.sourceforge.net>
+
        * libexif/olympus/mnote-olympus-tag.[c,h]: New tags discovered by
          Serge Droz <serge.droz@psi.ch>.
 

diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c
index ea71da9..129f582 100644 (file)
--- a/libexif/olympus/mnote-olympus-entry.c
+++ b/libexif/olympus/mnote-olympus-entry.c
@@ -164,7 +164,7 @@ static struct {
 char *
 mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int maxlen)
 {
-       char         buf[32];
+       char         buf[300];
        ExifLong     vl;
        ExifShort    vs = 0;
        ExifRational vr;
@@ -528,7 +528,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                                  entry->size);
                        for (i = 0; i < entry->size; i++) {
                                sprintf (buf, " %02x", entry->data[i]);
-                               strncat (v, buf, maxlen - strlen (v));
+                               strncat (v, buf, maxlen);
                        }
                        break;
                }