Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26543/libexif
Modified Files:
exif-data.c
Log Message:
don't dereference NULL (CID 4)
Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -d -r1.90 -r1.91
--- exif-data.c 10 May 2007 14:32:01 -0000 1.90
+++ exif-data.c 11 May 2007 02:59:57 -0000 1.91
@@ -193,7 +193,13 @@ exif_data_load_data_entry (ExifData *dat
/* If this is the MakerNote, remember the offset */
if (entry->tag == EXIF_TAG_MAKER_NOTE) {
- if (entry->size > 6) exif_log (data->priv->log,
+ if (entry->data) {
+ exif_log (data->priv->log,
+ EXIF_LOG_CODE_DEBUG, "ExifData",
+ "MakerNote found with NULL data");
+ }
+ else if (entry->size > 6)
+ exif_log (data->priv->log,
EXIF_LOG_CODE_DEBUG, "ExifData",
"MakerNote found (%02x %02x %02x %02x "
"%02x %02x %02x...).",
|
