eog r4683 - in trunk: . src

[friemann svn gnome org]

Author: friemann
Date: Wed Aug 13 10:57:52 2008
New Revision: 4683
URL: http://svn.gnome.org/viewvc/eog?rev=4683&view=rev

Log:
2008-08-13  Felix Riemann  <friemann svn gnome org>

	* src/eog-thumbnail.c: (eog_thumb_data_new): Fix GError usage to 
	avoid crashes when querying the file info fails. Fixes bug #547566.


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

Modified: trunk/src/eog-thumbnail.c
==============================================================================
--- trunk/src/eog-thumbnail.c	(original)
+++ trunk/src/eog-thumbnail.c	Wed Aug 13 10:57:52 2008
@@ -143,7 +143,7 @@
 {
 	EogThumbData *data;
 	GFileInfo *file_info;
-	GError *ioerror;
+	GError *ioerror = NULL;
 
 	g_return_val_if_fail (file != NULL, NULL);
 	g_return_val_if_fail (error != NULL && *error == NULL, NULL);
@@ -163,7 +163,7 @@
 	if (file_info == NULL)
 	{
 		set_vfs_error (error, ioerror);
-		g_error_free (ioerror);
+		g_clear_error (&ioerror);
 	}
 
 	if (*error == NULL) {
@@ -185,7 +185,7 @@
 	else {
 		eog_thumb_data_free (data);
 		data = NULL;
-		g_error_free (ioerror);
+		g_clear_error (&ioerror);
 	}
 
 	g_object_unref (file_info);