Bug 558066 – format not a string literal and no format arguments

svn path=/trunk/; revision=3237

diff --git a/ChangeLog b/ChangeLog
index 3efe7132df57167bc585bbf746aa43e9569ce3ce..1c29980c2154eb5721e6dcc6032e5ee2b1bbbbb6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-27 Christian Persch <chpe@gnome.org>
+
+       * backend/djvu/djvu-document.c
+       * backend/ps/ev-spectre.c
+       * shell/ev-jobs.c: Use printf safely. Bug #558066.
+
 2008-10-24  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * shell/ev-view.c (ev_view_change_page),

diff --git a/backend/djvu/djvu-document.c b/backend/djvu/djvu-document.c
index 40950c7829c8bf68fab7f56f5d994af717097cba..a9559c22d854583431154dd1f6156395972d55d1 100644 (file)
--- a/backend/djvu/djvu-document.c
+++ b/backend/djvu/djvu-document.c
@@ -97,9 +97,9 @@ handle_message (const ddjvu_message_t *msg, GError **error)
                        }
                        
                        if (error) {
-                               g_set_error (error, EV_DJVU_ERROR, 0, error_str);
+                               g_set_error_literal (error, EV_DJVU_ERROR, 0, error_str);
                        } else {
-                               g_warning (error_str);
+                               g_warning ("%s", error_str);
                        }
                                
                        g_free (error_str);
@@ -178,10 +178,10 @@ djvu_document_load (EvDocument  *document,
 
        djvu_wait_for_message (djvu_document, DDJVU_DOCINFO, &djvu_error);
        if (djvu_error) {
-               g_set_error (error,
-                            EV_DOCUMENT_ERROR,
-                            EV_DOCUMENT_ERROR_INVALID,
-                            djvu_error->message);
+               g_set_error_literal (error,
+                                    EV_DOCUMENT_ERROR,
+                                    EV_DOCUMENT_ERROR_INVALID,
+                                    djvu_error->message);
                g_error_free (djvu_error);
                g_free (filename);
                ddjvu_document_release (djvu_document->d_document);
@@ -194,10 +194,10 @@ djvu_document_load (EvDocument  *document,
                djvu_handle_events (djvu_document, TRUE, &djvu_error);
 
        if (djvu_error) {
-               g_set_error (error,
-                            EV_DOCUMENT_ERROR,
-                            EV_DOCUMENT_ERROR_INVALID,
-                            djvu_error->message);
+               g_set_error_literal (error,
+                                    EV_DOCUMENT_ERROR,
+                                    EV_DOCUMENT_ERROR_INVALID,
+                                    djvu_error->message);
                g_error_free (djvu_error);
                g_free (filename);
                ddjvu_document_release (djvu_document->d_document);

diff --git a/backend/ps/ev-spectre.c b/backend/ps/ev-spectre.c
index 54b595700551c39219ee7de47b2cf1ff1d4c5a21..a918cb984937ced4a7ffb3d3a72f41ecc9afe0dc 100644 (file)
--- a/backend/ps/ev-spectre.c
+++ b/backend/ps/ev-spectre.c
@@ -307,7 +307,7 @@ ps_document_render (EvDocument      *document,
        }
 
        if (spectre_page_status (ps_page)) {
-               g_warning (spectre_status_to_string (spectre_page_status (ps_page)));
+               g_warning ("%s", spectre_status_to_string (spectre_page_status (ps_page)));
                g_free (data);
                
                return NULL;

diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c
index 6e1e3f19c445c80a96cb8ddfcb89888152fe8671..dee23b8d0f5b5ea2de8002b47ad59bb8f24c06c2 100644 (file)
--- a/shell/ev-jobs.c
+++ b/shell/ev-jobs.c
@@ -239,7 +239,7 @@ ev_job_failed (EvJob       *job,
        message = g_strdup_vprintf (format, args);
        va_end (args);
        
-       job->error = g_error_new (domain, code, message);
+       job->error = g_error_new_literal (domain, code, message);
        g_free (message);
        
        ev_job_emit_finished (job);