[libexif-cvs] libexif/libexif exif-data.c,1.93,1.94

[Jan P. <pa...@us...>]

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

Modified Files:
	exif-data.c 
Log Message:
Makernote is parsed even when there is not enough data for (makernote-irelevant) IFD1


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -d -r1.93 -r1.94
--- exif-data.c	13 May 2007 19:24:01 -0000	1.93
+++ exif-data.c	14 May 2007 05:43:10 -0000	1.94
@@ -669,7 +669,7 @@ exif_data_get_type_maker_note (ExifData 
 		return EXIF_DATA_TYPE_MAKER_NOTE_NONE;
 	
 	e = exif_data_get_entry (d, EXIF_TAG_MAKER_NOTE);
-        if (!e) 
+	if (!e) 
 		return EXIF_DATA_TYPE_MAKER_NOTE_NONE;
 
 	/* Olympus & Nikon */
@@ -842,11 +842,10 @@ exif_data_load_data (ExifData *data, con
 		/* Sanity check. */
 		if (offset > ds - 6) {
 			exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA,
-				  "ExifData", "Bogus offset.");
-			return;
+				  "ExifData", "Bogus offset of IFD1.");
+		} else {
+		   exif_data_load_data_content (data, EXIF_IFD_1, d + 6, ds - 6, offset, 0);
 		}
-
-		exif_data_load_data_content (data, EXIF_IFD_1, d + 6, ds - 6, offset, 0);
 	}
 
 	/*