projects
/
platform
/
upstream
/
libexif.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eaf86c7
)
don't dereference NULL (CID 4)
author
Hubert Figuière
<hub@figuiere.net>
Fri, 11 May 2007 02:59:57 +0000
(22:59 -0400)
committer
Hubert Figuière
<hub@figuiere.net>
Fri, 11 May 2007 02:59:57 +0000
(22:59 -0400)
libexif/exif-data.c
patch
|
blob
|
history
diff --git
a/libexif/exif-data.c
b/libexif/exif-data.c
index
d7101c5
..
6b6f27c
100644
(file)
--- a/
libexif/exif-data.c
+++ b/
libexif/exif-data.c
@@
-193,7
+193,13
@@
exif_data_load_data_entry (ExifData *data, ExifEntry *entry,
/* 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...).",