eog r4532 - in branches/gnome-2-22: . src

[csaavedra svn gnome org]

Author: csaavedra
Date: Sun Apr 13 02:13:40 2008
New Revision: 4532
URL: http://svn.gnome.org/viewvc/eog?rev=4532&view=rev

Log:
2008-04-12  Claudio Saavedra  <csaavedra gnome org>

	* src/eog-image.c: (eog_image_real_load): Do not crash if the
	error parameter is NULL.



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/eog-image.c

Modified: branches/gnome-2-22/src/eog-image.c
==============================================================================
--- branches/gnome-2-22/src/eog-image.c	(original)
+++ branches/gnome-2-22/src/eog-image.c	Sun Apr 13 02:13:40 2008
@@ -962,7 +962,7 @@
 
 	eog_image_get_file_info (img, &priv->bytes, &mime_type, error);
 
-	if (*error) {
+	if (error && *error) {
 		g_free (mime_type);
 		return FALSE;
 	}
@@ -1004,7 +1004,7 @@
 
 		loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, error);
 	
-		if (*error) {
+		if (error && *error) {
 			g_error_free (*error);
 			*error = NULL;
 
@@ -1134,7 +1134,7 @@
 	failed = (failed ||
 		  priv->cancel_loading || 
 		  bytes_read_total == 0 || 
-		  *error != NULL);
+		  (error && *error != NULL));
 
 	if (failed) {
 		if (priv->cancel_loading) {
@@ -1185,7 +1185,7 @@
 	}	
 
 	/* Catch-all in case of poor-error reporting */
-	if (failed && *error == NULL) {
+	if (failed && error && *error == NULL) {
 		g_set_error (error, 
 			     EOG_IMAGE_ERROR,
 			     EOG_IMAGE_ERROR_GENERIC,