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

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

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

Modified Files:
	exif-entry.c 
Log Message:

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

	Bug discovered by Jay Love <js...@us...>

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


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- exif-entry.c	28 Apr 2003 18:22:17 -0000	1.32
+++ exif-entry.c	28 Apr 2003 18:34:19 -0000	1.33
@@ -192,12 +192,13 @@
 		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