From: Christian Persch <chpe@src.gnome.org>
Date: Sun, 15 Feb 2009 13:52:56 +0000 (+0000)
Subject: Make sure to always set @error when returning FALSE.
X-Git-Tag: EVINCE_2_25_91~27
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=d37177eb94fcdd9bdaac6aa664d96a01ad9372db;p=evince.git

Make sure to always set @error when returning FALSE.

	* backend/tiff/tiff-document.c: (tiff_document_load): Make sure
	to always set @error when returning FALSE.

svn path=/trunk/; revision=3453
---

diff --git a/ChangeLog b/ChangeLog
index 04ebd2b6..3ef14dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-14  Christian Persch  <chpe@gnome.org>
+
+	* backend/tiff/tiff-document.c: (tiff_document_load): Make sure
+	to always set @error when returning FALSE.
+
 2009-02-14  Christian Persch  <chpe@gnome.org>
 
 	* backend/comics/comics-document.c: (comics_document_load): Make sure
diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index 6969a1bd..5501451c 100644
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -91,13 +91,11 @@ tiff_document_load (EvDocument  *document,
 	gchar *filename;
 	TIFF *tiff;
 	
-	push_handlers ();
 	filename = g_filename_from_uri (uri, NULL, error);
-	if (!filename) {
-		pop_handlers ();
+	if (!filename)
 		return FALSE;
-	}
 	
+	push_handlers ();
 	tiff = TIFFOpen (filename, "r");
 	if (tiff) {
 		guint32 w, h;
@@ -109,6 +107,13 @@ tiff_document_load (EvDocument  *document,
 	
 	if (!tiff) {
 		pop_handlers ();
+
+    		g_set_error_literal (error,
+				     EV_DOCUMENT_ERROR,
+				     EV_DOCUMENT_ERROR_INVALID,
+				     _("Invalid document"));
+
+		g_free (filename);
 		return FALSE;
 	}