r29957 - in /desktop/unstable/anjuta/debian: changelog patches/03_fix_format_string_vulnerability.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Oct  3 23:21:45 2011
New Revision: 29957

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29957
Log:
* debian/patches/03_fix_format_string_vulnerability.patch
  - Fix format string vulnerability. (Closes: #643351)

Added:
    desktop/unstable/anjuta/debian/patches/03_fix_format_string_vulnerability.patch
Modified:
    desktop/unstable/anjuta/debian/changelog
    desktop/unstable/anjuta/debian/patches/series

Modified: desktop/unstable/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/changelog?rev=29957&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/changelog [utf-8] (original)
+++ desktop/unstable/anjuta/debian/changelog [utf-8] Mon Oct  3 23:21:45 2011
@@ -4,6 +4,8 @@
   * debian/control.in:
     - Update Build-Depends on vala to 0.14.
     - Set pkg-gnome-maintainers at lists.alioth.debian.org as Maintainer.
+  * debian/patches/03_fix_format_string_vulnerability.patch
+    - Fix format string vulnerability. (Closes: #643351)
 
  -- Michael Biebl <biebl at debian.org>  Mon, 03 Oct 2011 19:42:05 +0200
 

Added: desktop/unstable/anjuta/debian/patches/03_fix_format_string_vulnerability.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/03_fix_format_string_vulnerability.patch?rev=29957&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/03_fix_format_string_vulnerability.patch (added)
+++ desktop/unstable/anjuta/debian/patches/03_fix_format_string_vulnerability.patch [utf-8] Mon Oct  3 23:21:45 2011
@@ -1,0 +1,70 @@
+From 4acd4ba1d9a52d3ad45143c947cee6da9f97f7ae Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Tue, 4 Oct 2011 01:08:27 +0200
+Subject: [PATCH] Fix format string vulnerability by using g_set_error_literal
+ ()
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=660841
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643351
+---
+ plugins/am-project/am-project.c |   18 ++++++++++++++----
+ plugins/mk-project/mk-project.c |   15 ++++++++++++---
+ 2 files changed, 26 insertions(+), 7 deletions(-)
+
+Index: anjuta-3.2.0/plugins/am-project/am-project.c
+===================================================================
+--- anjuta-3.2.0.orig/plugins/am-project/am-project.c	2011-08-03 15:28:44.000000000 +0200
++++ anjuta-3.2.0/plugins/am-project/am-project.c	2011-10-04 01:18:43.424962607 +0200
+@@ -1647,11 +1647,21 @@
+ 	
+ 	if (project->configure_token == NULL)
+ 	{
+-		g_set_error (error, IANJUTA_PROJECT_ERROR, 
++		if (err != NULL)
++		{
++			g_set_error_literal (error, IANJUTA_PROJECT_ERROR,
+ 						IANJUTA_PROJECT_ERROR_PROJECT_MALFORMED,
+-						err == NULL ? _("Unable to parse project file") : err->message);
+-		if (err != NULL) g_error_free (err);
+-			return FALSE;
++						err->message);
++			g_error_free (err);
++		}
++		else
++		{
++			g_set_error (error, IANJUTA_PROJECT_ERROR,
++						IANJUTA_PROJECT_ERROR_PROJECT_MALFORMED,
++						_("Unable to parse project file"));
++		}
++
++		return FALSE;
+ 	}
+ 
+ 	/* Load all makefiles recursively */
+Index: anjuta-3.2.0/plugins/mk-project/mk-project.c
+===================================================================
+--- anjuta-3.2.0.orig/plugins/mk-project/mk-project.c	2011-08-03 15:28:44.000000000 +0200
++++ anjuta-3.2.0/plugins/mk-project/mk-project.c	2011-10-04 01:14:57.291805487 +0200
+@@ -486,10 +486,19 @@
+ 	mkp_scanner_free (scanner);
+ 	if (!ok)
+ 	{
+-		g_set_error (error, IANJUTA_PROJECT_ERROR,
++		if (err != NULL)
++		{
++			g_set_error_literal (error, IANJUTA_PROJECT_ERROR,
+ 						IANJUTA_PROJECT_ERROR_PROJECT_MALFORMED,
+-						err == NULL ? _("Unable to parse make file") : err->message);
+-		if (err != NULL) g_error_free (err);
++						err->message);
++			g_error_free (err);
++		}
++		else
++		{
++			g_set_error (error, IANJUTA_PROJECT_ERROR,
++						IANJUTA_PROJECT_ERROR_PROJECT_MALFORMED,
++						_("Unable to parse make file"));
++		}
+ 
+ 		return NULL;
+ 	}

Modified: desktop/unstable/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/series?rev=29957&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/series [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/series [utf-8] Mon Oct  3 23:21:45 2011
@@ -1,3 +1,4 @@
 01_about_license_file.patch
 02_skip_directories_when_reading_schema_files.patch
+03_fix_format_string_vulnerability.patch
 99_ltmain_as-needed.patch