nautilus r14129 - in trunk: . src

[hansp svn gnome org]

Author: hansp
Date: Sat May  3 23:59:23 2008
New Revision: 14129
URL: http://svn.gnome.org/viewvc/nautilus?rev=14129&view=rev

Log:
2008-05-03  Hans Petter Jansson  <hpj novell com>

	* src/nautilus-image-properties-page.c (append_exifdata_string):
	If we get a NULL exifdata, don't try to dereference it. Fixes
	BGO #530851.


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-image-properties-page.c

Modified: trunk/src/nautilus-image-properties-page.c
==============================================================================
--- trunk/src/nautilus-image-properties-page.c	(original)
+++ trunk/src/nautilus-image-properties-page.c	Sat May  3 23:59:23 2008
@@ -228,7 +228,7 @@
 static void
 append_exifdata_string (ExifData *exifdata, GString *string)
 {
-	if (exifdata->ifd[0] && exifdata->ifd[0]->count) {
+	if (exifdata && exifdata->ifd[0] && exifdata->ifd[0]->count) {
                 append_tag_value_pair (string, exifdata, EXIF_TAG_MAKE, _("Camera Brand"));
                 append_tag_value_pair (string, exifdata, EXIF_TAG_MODEL, _("Camera Model"));