[libexif-cvs] libexif/libexif exif-entry.c,1.33,1.34

[<lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv10632/libexif

Modified Files:
	exif-entry.c 
Log Message:

2003-04-29  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c: Another attempt to fix EXIF_TAG_COPYRIGHT.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- exif-entry.c	28 Apr 2003 18:34:19 -0000	1.33
+++ exif-entry.c	29 Apr 2003 04:57:31 -0000	1.34
@@ -193,14 +193,14 @@
 	case EXIF_TAG_COPYRIGHT:
 		CF (e->format, EXIF_FORMAT_ASCII, v);
 		if (e->size && e->data)
-			strncpy (v, e->data, sizeof (v));
+			strncpy (v, e->data, MIN (sizeof (v) - 1, e->size));
 		else
-			strncpy (v, "[None]", sizeof (v));
-		strncat (v, " (Photographer) - ", sizeof (v));
+			strncpy (v, "[None]", sizeof (v) - 1);
+		strncat (v, " (Photographer) - ", sizeof (v) - 1);
 		if (e->size && e->data &&
-		    strlen ((char *) e->data + strlen ((char *) e->data) + 1))
+		    (strlen ((char *) e->data) + 1 < e->size))
 			strncat (v, e->data + strlen (e->data) + 1,
-				 sizeof (v));
+				 sizeof (v) - 1);
 		else
 			strncat (v, "[None]", sizeof (v));
 		strncat (v, " (Editor)", sizeof (v));