From 84a2f22e66164f29a0eb5fc1dd560f9927753f38 Mon Sep 17 00:00:00 2001
From: Justin Maggard <jmaggard@netgear.com>
Date: Mon, 22 Jun 2009 22:27:15 +0000
Subject: [PATCH] * Fix crash bug if loading exif data from an image fails.

---
 metadata.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/metadata.c b/metadata.c
index d6d81d5..901b6d3 100644
--- a/metadata.c
+++ b/metadata.c
@@ -365,6 +365,8 @@ GetImageMetadata(const char * path, char * name)
 	exif_loader_write_file(l, path);
 	ed = exif_loader_get_data(l);
 	exif_loader_unref(l);
+	if( !ed )
+		goto no_exifdata;
 
 	tag = EXIF_TAG_PIXEL_X_DIMENSION;
 	e = exif_content_get_entry(ed->ifd[EXIF_IFD_EXIF], tag);
@@ -435,6 +437,7 @@ GetImageMetadata(const char * path, char * name)
 
 	exif_data_unref(ed);
 
+no_exifdata:
 	/* If EXIF parsing fails, then fall through to reading the JPEG data with libjpeg to get the resolution */
 	if( !width || !height )
 	{