Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24480/libexif/olympus
Modified Files:
mnote-olympus-entry.c
Log Message:
dont derefernce NULL (CID 3)
Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- mnote-olympus-entry.c 8 May 2007 09:18:36 -0000 1.29
+++ mnote-olympus-entry.c 11 May 2007 02:54:40 -0000 1.30
@@ -180,7 +180,8 @@ mnote_olympus_entry_get_value (MnoteOlym
memset (v, 0, maxlen);
maxlen--;
- if ((!entry->data) && (entry->components > 0)) return (v);
+ if ((!entry->data) && (entry->components > 0))
+ return (v);
switch (entry->tag) {
@@ -229,8 +230,13 @@ mnote_olympus_entry_get_value (MnoteOlym
case MNOTE_NIKON_TAG_IMAGEADJUSTMENT:
case MNOTE_NIKON_TAG_ADAPTER:
case MNOTE_NIKON_TAG_SATURATION2:
- CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
- memcpy(v, entry->data, MIN (maxlen, entry->components));
+ if (entry->data == NULL) {
+ *v = 0;
+ }
+ else {
+ CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
+ memcpy(v, entry->data, MIN (maxlen, entry->components));
+ }
break;
case MNOTE_NIKON_TAG_TOTALPICTURES:
CF (entry->format, EXIF_FORMAT_LONG, v, maxlen);
|
