[libexif-cvs] libexif/libexif exif-entry.c,1.114,1.115

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13120/libexif

Modified Files:
	exif-entry.c 
Log Message:
Make sure a buffer is NUL-terminated even in an error condition.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -d -r1.114 -r1.115
--- exif-entry.c	24 Jan 2008 21:45:35 -0000	1.114
+++ exif-entry.c	25 Jan 2008 03:51:30 -0000	1.115
@@ -590,16 +590,16 @@ exif_entry_get_value (ExifEntry *e, char
 	 */
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
-	/* We need the byte order */
-	if (!e || !e->parent || !e->parent->parent)
-		return val;
-	o = exif_data_get_byte_order (e->parent->parent);
-
 	/* make sure the returned string is zero terminated */
 	memset (val, 0, maxlen);
 	maxlen--;
 	memset (b, 0, sizeof (b));
 
+	/* We need the byte order */
+	if (!e || !e->parent || !e->parent->parent)
+		return val;
+	o = exif_data_get_byte_order (e->parent->parent);
+
 	/* Sanity check */
 	if (e->size != e->components * exif_format_get_size (e->format)) {
 		snprintf (val, maxlen, _("Invalid size of entry (%i, "