[libexif-cvs] exif/exif actions.c,1.18,1.19

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

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21247/exif

Modified Files:
	actions.c 
Log Message:

2004-06-22  Lutz Mueller <lu...@us...>

	* exif/actions.c: Don't crash if return value is NULL. Spotted by
	  Serge Droz <ser...@ps...>.
	  Kill warning.


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- actions.c	6 Jun 2004 03:02:04 -0000	1.18
+++ actions.c	22 Jun 2004 18:01:19 -0000	1.19
@@ -104,6 +104,7 @@
 	char b[1024];
 	char b1[1024], b2[1024];
 	ExifMnoteData *n;
+	const char *p;
 
 	n = exif_data_get_mnote_data (ed);
 	if (!n) {
@@ -123,8 +124,10 @@
 		printf (_("MakerNote contains %i values:\n"), c);
 	}
 	for (i = 0; i < c; i++) {
-		strncpy (b1, C (exif_mnote_data_get_title (n, i)), bs);
-		strncpy (b2, C (exif_mnote_data_get_value (n, i, b, bs)), bs);
+		p = C (exif_mnote_data_get_title (n, i));
+		strncpy (b1, p ? p : _("Unknown tag"), bs);
+		p = C (exif_mnote_data_get_value (n, i, b, bs));
+		strncpy (b2, p ? p : _("Unknown value"), bs);
 		printf ("%s: %s\n", b1, b2);
 	}
 }
@@ -166,7 +169,7 @@
 show_entry_machine (ExifEntry *e, void *data)
 {
 	unsigned char *ids = data;
-	char *v[1024];
+	char v[1024];
 
 	if (*ids) fprintf (stdout, "0x%04x", e->tag);
 	else fprintf (stdout, "%s", exif_tag_get_title (e->tag));