diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | backend/tiff/tiff-document.c | 13 |
2 files changed, 14 insertions, 4 deletions
@@ -1,5 +1,10 @@ 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 to always set @error when returning FALSE. diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c index 6969a1b..5501451 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; } |