eog r4483 - in trunk: . src

[csaavedra svn gnome org]

Author: csaavedra
Date: Thu Mar 20 05:40:56 2008
New Revision: 4483
URL: http://svn.gnome.org/viewvc/eog?rev=4483&view=rev

Log:
2008-03-20  Claudio Saavedra  <csaavedra gnome org>

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



Modified:
   trunk/ChangeLog
   trunk/src/eog-image.c

Modified: trunk/src/eog-image.c
==============================================================================
--- trunk/src/eog-image.c	(original)
+++ trunk/src/eog-image.c	Thu Mar 20 05:40:56 2008
@@ -951,7 +951,7 @@
 
 	eog_image_get_file_info (img, &priv->bytes, &mime_type, error);
 
-	if (*error) {
+	if (error && *error) {
 		g_free (mime_type);
 		return FALSE;
 	}
@@ -994,7 +994,7 @@
 
 		loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, error);
 	
-		if (*error) {
+		if (error && *error) {
 			g_error_free (*error);
 			*error = NULL;
 
@@ -1126,7 +1126,7 @@
 	failed = (failed ||
 		  priv->cancel_loading || 
 		  bytes_read_total == 0 || 
-		  *error != NULL);
+		  (error && *error != NULL));
 
 	if (failed) {
 		if (priv->cancel_loading) {
@@ -1177,7 +1177,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,