[gnubik] Don't use error messages as formats

[Bruno Wolff III]

commit 1a20f38c02e1687f96a31b3eb7f995d5cf999792
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Jun 8 22:46:10 2014 -0500

    Don't use error messages as formats
    
    A few error messages were used as formats that weren't locally
    defined and so it isn't obvious that they were safe to use
    as formats. So '%s' format strings were added to make sure
    a mistake doesn't happen.

 format_fix.patch |   31 +++++++++++++++++++++++++++++++
 gnubik.spec      |    8 +++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/format_fix.patch b/format_fix.patch
new file mode 100644
index 0000000..3fb5bdd
--- /dev/null
+++ b/format_fix.patch
@@ -0,0 +1,31 @@
+--- src/menus.c.orig	2014-06-08 22:14:26.461547599 -0500
++++ src/menus.c	2014-06-08 22:26:31.906747953 -0500
+@@ -549,7 +549,7 @@
+   dialog = gtk_message_dialog_new (parent,
+ 				   GTK_DIALOG_MODAL,
+ 				   GTK_MESSAGE_ERROR,
+-				   GTK_BUTTONS_CLOSE, message);
++				   GTK_BUTTONS_CLOSE, '%s', message);
+   g_free (message);
+ 
+   gtk_window_set_title (GTK_WINDOW (dialog), _("Gnubik error"));
+--- src/swatch.c.orig	2014-06-08 22:41:24.502192244 -0500
++++ src/swatch.c	2014-06-08 22:42:13.052362721 -0500
+@@ -255,7 +255,7 @@
+ 	    utf8 = g_locale_to_utf8 (*s, -1, 0, 0, &gerr);
+ 	    if (gerr)
+ 	      {
+-		g_warning (gerr->message);
++		g_warning ('%s', gerr->message);
+ 		g_clear_error (&gerr);
+ 		gerr = 0;
+ 		continue;
+@@ -265,7 +265,7 @@
+ 	    filename = g_filename_from_uri (utf8, 0, &gerr);
+ 	    if (gerr)
+ 	      {
+-		g_warning (gerr->message);
++		g_warning ('%s', gerr->message);
+ 		g_clear_error (&gerr);
+ 		continue;
+ 	      }
diff --git a/gnubik.spec b/gnubik.spec
index 699ba90..03d1b88 100644
--- a/gnubik.spec
+++ b/gnubik.spec
@@ -1,6 +1,6 @@
 Name:           gnubik
 Version:        2.4.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        3D interactive graphics puzzle
 
 Group:          Amusements/Games
@@ -8,6 +8,8 @@ License:        GPLv3+
 URL:            http://www.gnu.org/software/gnubik/
 Source0:        ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+# Don't use error messages used as a formats
+Patch1:         format_fix.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  libX11-devel guile-devel libGL-devel libGLU-devel gtk2-devel gtkglext-devel
@@ -27,6 +29,7 @@ chmod -x src/{quarternion,txfm}.{c,h}
 # Remove pregenerated binaries and let them be gerenerated
 rm po/*.pot
 rm doc/%{name}.info
+%patch1 -b .format_fix
 
 
 %build
@@ -88,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Jun 08 2014 Bruno Wolff III <bruno at wolff.to> 2.4.1-4
+- Don't use error messages as formats
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild