From 51e022d2883c91feae664dbbba6d03ca81b95865 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 20 Jul 2009 16:19:40 +0300 Subject: metadata: don't dereference the pointer before the validity check --- ext/metadata/metadataexif.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/metadata/metadataexif.c b/ext/metadata/metadataexif.c index cbdbf30d..1fb97d58 100644 --- a/ext/metadata/metadataexif.c +++ b/ext/metadata/metadataexif.c @@ -556,11 +556,13 @@ metadataparse_exif_content_foreach_entry_func (ExifEntry * entry, MEUserData *meudata = (MEUserData *) user_data; GType type = G_TYPE_NONE; ExifByteOrder byte_order; - const gchar *tag = metadataparse_exif_get_tag_from_exif (entry->tag, &type); + const gchar *tag; /* We need the byte order */ if (!entry || !entry->parent || !entry->parent->parent) return; + + tag = metadataparse_exif_get_tag_from_exif (entry->tag, &type); byte_order = exif_data_get_byte_order (entry->parent->parent); if (metadataparse_handle_unit_tags (entry, meudata, byte_order)) -- cgit v1.2.1