r31462 - in /desktop/unstable/aisleriot/debian: changelog patches/ patches/99_format-security.patch patches/series

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Thu Nov 17 03:03:26 2011
New Revision: 31462

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31462
Log:
* 99_format-security.patch:
  - Git patch to fix build with -Werror=format-security

Added:
    desktop/unstable/aisleriot/debian/patches/
    desktop/unstable/aisleriot/debian/patches/99_format-security.patch
    desktop/unstable/aisleriot/debian/patches/series
Modified:
    desktop/unstable/aisleriot/debian/changelog

Modified: desktop/unstable/aisleriot/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/changelog?rev=31462&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/changelog [utf-8] (original)
+++ desktop/unstable/aisleriot/debian/changelog [utf-8] Thu Nov 17 03:03:26 2011
@@ -2,5 +2,7 @@
 
   * Initial release
     - Aisleriot is no longer shipped as part of gnome-games
+  * 99_format-security.patch:
+    - Git patch to fix build with -Werror=format-security
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 16 Aug 2011 17:54:28 -0400
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Wed, 16 Nov 2011 17:54:28 -0400

Added: desktop/unstable/aisleriot/debian/patches/99_format-security.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/patches/99_format-security.patch?rev=31462&op=file
==============================================================================
--- desktop/unstable/aisleriot/debian/patches/99_format-security.patch (added)
+++ desktop/unstable/aisleriot/debian/patches/99_format-security.patch [utf-8] Thu Nov 17 03:03:26 2011
@@ -1,0 +1,34 @@
+From b02511b216c31b1cc162b72e9a2a5bbe6286a24e Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Mon, 14 Nov 2011 08:33:44 +0000
+Subject: game_scm_pre_unwind_handler(): Fix potential format string crash
+
+Use g_set_error_literal() for setting the error message to the stack trace, as
+this might contain format string macros. Spotted by building with
+-Werror=format-security:
+
+game.c: In function 'game_scm_pre_unwind_handler':
+game.c:425:24: error: format not a string literal and no format arguments [-Werror=format-security]
+(cherry picked from commit 3e6a3c973992905a25a24102423322f8a4a01977)
+---
+diff --git a/src/game.c b/src/game.c
+index d2fa05b..c90dcd8 100644
+--- a/src/game.c
++++ b/src/game.c
+@@ -405,11 +405,11 @@ game_scm_pre_unwind_handler (void *user_data,
+     return SCM_UNDEFINED;
+ 
+   message = cscmi_exception_get_backtrace (tag, throw_args);
+-  g_set_error (error,
+-               AISLERIOT_GAME_ERROR,
+-               GAME_ERROR_EXCEPTION,
+-               message ? message
+-                       : "A scheme exception occurred, but there was no exception info");
++  g_set_error_literal (error,
++                       AISLERIOT_GAME_ERROR,
++                       GAME_ERROR_EXCEPTION,
++                       message ? message
++                               : "A scheme exception occurred, but there was no exception info");
+   return SCM_UNDEFINED;
+ }
+

Added: desktop/unstable/aisleriot/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/patches/series?rev=31462&op=file
==============================================================================
--- desktop/unstable/aisleriot/debian/patches/series (added)
+++ desktop/unstable/aisleriot/debian/patches/series [utf-8] Thu Nov 17 03:03:26 2011
@@ -1,0 +1,1 @@
+99_format-security.patch