gimp r27550 - in branches/gimp-2-6: . app/file app/pdb

[neo svn gnome org]

Author: neo
Date: Tue Nov  4 12:36:01 2008
New Revision: 27550
URL: http://svn.gnome.org/viewvc/gimp?rev=27550&view=rev

Log:
2008-11-04  Sven Neumann  <sven gimp org>

	* app/file/file-procedure.c
	* app/file/file-save.c
	* app/pdb/gimpprocedure.c: be careful when passing literal 
strings
	to g_set_error().



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/file/file-procedure.c
   branches/gimp-2-6/app/file/file-save.c
   branches/gimp-2-6/app/pdb/gimpprocedure.c

Modified: branches/gimp-2-6/app/file/file-procedure.c
==============================================================================
--- branches/gimp-2-6/app/file/file-procedure.c	(original)
+++ branches/gimp-2-6/app/file/file-procedure.c	Tue Nov  4 12:36:01 2008
@@ -138,7 +138,7 @@
                       g_set_error (error,
                                    G_FILE_ERROR,
                                    g_file_error_from_errno (errno),
-                                   g_strerror (errno));
+                                   "%s", g_strerror (errno));
                     }
                 }
 
@@ -173,7 +173,7 @@
             g_set_error (error,
                          G_FILE_ERROR,
                          g_file_error_from_errno (errno),
-                         g_strerror (errno));
+                         "%s", g_strerror (errno));
 
           fclose (ifp);
         }

Modified: branches/gimp-2-6/app/file/file-save.c
==============================================================================
--- branches/gimp-2-6/app/file/file-save.c	(original)
+++ branches/gimp-2-6/app/file/file-save.c	Tue Nov  4 12:36:01 2008
@@ -108,7 +108,7 @@
           if (! g_file_test (filename, G_FILE_TEST_IS_REGULAR))
             {
               g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                           _("Not a regular file"));
+                           "%s", _("Not a regular file"));
               status = GIMP_PDB_EXECUTION_ERROR;
               goto out;
             }
@@ -116,7 +116,7 @@
           if (g_access (filename, W_OK) != 0)
             {
               g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_ACCES,
-                           g_strerror (errno));
+                           "%s", g_strerror (errno));
               status = GIMP_PDB_EXECUTION_ERROR;
               goto out;
             }

Modified: branches/gimp-2-6/app/pdb/gimpprocedure.c
==============================================================================
--- branches/gimp-2-6/app/pdb/gimpprocedure.c	(original)
+++ branches/gimp-2-6/app/pdb/gimpprocedure.c	Tue Nov  4 12:36:01 2008
@@ -347,7 +347,8 @@
                   G_VALUE_HOLDS_STRING (&return_vals->values[1]))
                 {
                   g_set_error (error, 0, 0,
-                               g_value_get_string (&return_vals->values[1]));
+                               "%s",
+			       g_value_get_string (&return_vals->values[1]));
                 }
             }
         }