Check return value of psscan before trying to use it. Fixes bug #372414.

2007-02-11  Tom Parker  <palfrey@tevp.net>
	* backend/ps/ps-document.c: (document_load):
	Check return value of psscan before trying
	to use it. Fixes bug #372414.

svn path=/trunk/; revision=2314

diff --git a/ChangeLog b/ChangeLog
index 3ed2f7bcff652b5d0cea7a6616ab91b339f712a5..2fca65b08bf5e72d31eb342522a8d2734cbc4021 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-11  Tom Parker  <palfrey@tevp.net>
+
+       * backend/ps/ps-document.c: (document_load):
+
+       Check return value of psscan before trying
+       to use it. Fixes bug #372414.
+
 2007-02-11  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-page-cache.c: (ev_page_cache_finalize):

diff --git a/backend/ps/ps-document.c b/backend/ps/ps-document.c
index 0ce2dfc6ce7e673ad0e885b9b1b41b35ee4c14eb..05533c37da32837b6e907663cedb972ec2aa7404 100644 (file)
--- a/backend/ps/ps-document.c
+++ b/backend/ps/ps-document.c
@@ -85,8 +85,6 @@ struct _PSDocument {
 
        gint  *ps_export_pagelist;
        gchar *ps_export_filename;
-
-       const gchar *gs_status;       /* PSDocument status */
 };
 
 struct _PSDocumentClass {
@@ -161,8 +159,6 @@ ps_document_init (PSDocument *gs)
        gs->bytes_left = 0;
        gs->buffer_bytes_left = 0;
 
-       gs->gs_status = _("No document loaded.");
-
        gs->ps_export_pagelist = NULL;
        gs->ps_export_filename = NULL;
 }
@@ -537,10 +533,6 @@ ps_interpreter_stop (PSDocument *gs)
                while ((wait (&status) == -1) && (errno == EINTR));
                g_spawn_close_pid (gs->interpreter_pid);
                gs->interpreter_pid = -1;
-               
-               if (status == 1) {
-                       gs->gs_status = _("Interpreter failed.");
-               }
        }
 
        if (gs->interpreter_input) {
@@ -601,13 +593,8 @@ ps_interpreter_is_ready (PSDocument *gs)
 
 /* EvDocumentIface */
 static gboolean
-document_load (PSDocument *gs, const gchar *fname)
+document_load (PSDocument *gs, const gchar *fname, GError **error)
 {
-       if (fname == NULL) {
-               gs->gs_status = "";
-               return FALSE;
-       }
-
        /* prepare this document */
        gs->structured_doc = FALSE;
        gs->send_filename_to_gs = TRUE;
@@ -619,26 +606,39 @@ document_load (PSDocument *gs, const gchar *fname)
         */
        if (!g_file_test (fname, G_FILE_TEST_IS_REGULAR)) {
                gchar *filename_dsp;
-               gchar *msg;
-               
+
                filename_dsp = g_filename_display_name (fname);
-               msg = g_strdup_printf (_("Cannot open file “%s”.\n"), filename_dsp);
+               g_set_error (error,
+                            G_FILE_ERROR,
+                            G_FILE_ERROR_NOENT,
+                            _("Cannot open file “%s”.\n"), /* FIXME: remove \n after freeze */
+                            filename_dsp);
                g_free (filename_dsp);
                
-               ps_interpreter_failed (gs, msg);
-               g_free (msg);
-               gs->gs_status = _("File is not readable.");
-               
+               ps_interpreter_failed (gs, NULL);
                return FALSE;
        }
 
        if (!gs->gs_filename || (gs->gs_psfile = fopen (gs->gs_filename, "r")) == NULL) {
+               gchar *filename_dsp;
+
+               filename_dsp = g_filename_display_name (fname);
+               g_set_error (error,
+                            G_FILE_ERROR,
+                            G_FILE_ERROR_NOENT,
+                            _("Cannot open file “%s”.\n"), /* FIXME: remove \n after freeze */
+                            filename_dsp);
+               g_free (filename_dsp);
+               
                ps_interpreter_failed (gs, NULL);
                return FALSE;
        }
        
        /* we grab the vital statistics!!! */
        gs->doc = psscan (gs->gs_psfile, TRUE, gs->gs_filename);
+       if (!gs->doc)
+               return FALSE;
+       
        
        if ((!gs->doc->epsf && gs->doc->numpages > 0) ||
            (gs->doc->epsf && gs->doc->numpages > 1)) {
@@ -646,8 +646,6 @@ document_load (PSDocument *gs, const gchar *fname)
                gs->send_filename_to_gs = FALSE;
        }
 
-       gs->gs_status = _("Document loaded.");
-
        return TRUE;
 }
 
@@ -666,26 +664,27 @@ ps_document_load (EvDocument  *document,
 
        gs_path = g_find_program_in_path ("gs");
        if (!gs_path) {
-                   gchar *filename_dsp;
-                   
-                   filename_dsp = g_filename_display_name (filename);
-                   g_set_error (error,
-                                G_FILE_ERROR,
-                                G_FILE_ERROR_NOENT,
-                                _("Failed to load document “%s”. Ghostscript interpreter was not found in path"),
-                                filename);
-                   g_free (filename_dsp);
-                   g_free (filename);
-
-                   return FALSE;
+               gchar *filename_dsp;
+               
+               filename_dsp = g_filename_display_name (filename);
+               g_set_error (error,
+                            G_FILE_ERROR,
+                            G_FILE_ERROR_NOENT,
+                            _("Failed to load document “%s”. Ghostscript interpreter was not found in path"),
+                            filename);
+               g_free (filename_dsp);
+               g_free (filename);
+               
+               return FALSE;
        }
 
-       result = document_load (PS_DOCUMENT (document), filename);
-       if (!result) {
+       result = document_load (PS_DOCUMENT (document), filename, error);
+       if (!result && !(*error)) {
                gchar *filename_dsp;
                
                filename_dsp = g_filename_display_name (filename);
-               g_set_error (error, G_FILE_ERROR,
+               g_set_error (error,
+                            G_FILE_ERROR,
                             G_FILE_ERROR_FAILED,
                             _("Failed to load document “%s”"),
                             filename_dsp);